diff options
539 files changed, 11426 insertions, 3735 deletions
diff --git a/core/java/android/animation/ObjectAnimator.java b/core/java/android/animation/ObjectAnimator.java index 1d1086049fdd..5c4b979ccb3c 100644 --- a/core/java/android/animation/ObjectAnimator.java +++ b/core/java/android/animation/ObjectAnimator.java @@ -227,10 +227,11 @@ public final class ObjectAnimator extends ValueAnimator { /** * Constructs and returns an ObjectAnimator that animates between int values. A single - * value implies that that value is the one being animated to. Two values imply starting - * and ending values. More than two values imply a starting value, values to animate through - * along the way, and an ending value (these values will be distributed evenly across - * the duration of the animation). + * value implies that that value is the one being animated to, in which case the start value + * will be derived from the property being animated and the target object when {@link #start()} + * is called for the first time. Two values imply starting and ending values. More than two + * values imply a starting value, values to animate through along the way, and an ending value + * (these values will be distributed evenly across the duration of the animation). * * @param target The object whose property is to be animated. This object should * have a public method on it called <code>setName()</code>, where <code>name</code> is @@ -274,10 +275,11 @@ public final class ObjectAnimator extends ValueAnimator { /** * Constructs and returns an ObjectAnimator that animates between int values. A single - * value implies that that value is the one being animated to. Two values imply starting - * and ending values. More than two values imply a starting value, values to animate through - * along the way, and an ending value (these values will be distributed evenly across - * the duration of the animation). + * value implies that that value is the one being animated to, in which case the start value + * will be derived from the property being animated and the target object when {@link #start()} + * is called for the first time. Two values imply starting and ending values. More than two + * values imply a starting value, values to animate through along the way, and an ending value + * (these values will be distributed evenly across the duration of the animation). * * @param target The object whose property is to be animated. * @param property The property being animated. @@ -383,10 +385,11 @@ public final class ObjectAnimator extends ValueAnimator { /** * Constructs and returns an ObjectAnimator that animates between color values. A single - * value implies that that value is the one being animated to. Two values imply starting - * and ending values. More than two values imply a starting value, values to animate through - * along the way, and an ending value (these values will be distributed evenly across - * the duration of the animation). + * value implies that that value is the one being animated to, in which case the start value + * will be derived from the property being animated and the target object when {@link #start()} + * is called for the first time. Two values imply starting and ending values. More than two + * values imply a starting value, values to animate through along the way, and an ending value + * (these values will be distributed evenly across the duration of the animation). * * @param target The object whose property is to be animated. This object should * have a public method on it called <code>setName()</code>, where <code>name</code> is @@ -403,10 +406,11 @@ public final class ObjectAnimator extends ValueAnimator { /** * Constructs and returns an ObjectAnimator that animates between color values. A single - * value implies that that value is the one being animated to. Two values imply starting - * and ending values. More than two values imply a starting value, values to animate through - * along the way, and an ending value (these values will be distributed evenly across - * the duration of the animation). + * value implies that that value is the one being animated to, in which case the start value + * will be derived from the property being animated and the target object when {@link #start()} + * is called for the first time. Two values imply starting and ending values. More than two + * values imply a starting value, values to animate through along the way, and an ending value + * (these values will be distributed evenly across the duration of the animation). * * @param target The object whose property is to be animated. * @param property The property being animated. @@ -422,10 +426,11 @@ public final class ObjectAnimator extends ValueAnimator { /** * Constructs and returns an ObjectAnimator that animates between float values. A single - * value implies that that value is the one being animated to. Two values imply starting - * and ending values. More than two values imply a starting value, values to animate through - * along the way, and an ending value (these values will be distributed evenly across - * the duration of the animation). + * value implies that that value is the one being animated to, in which case the start value + * will be derived from the property being animated and the target object when {@link #start()} + * is called for the first time. Two values imply starting and ending values. More than two + * values imply a starting value, values to animate through along the way, and an ending value + * (these values will be distributed evenly across the duration of the animation). * * @param target The object whose property is to be animated. This object should * have a public method on it called <code>setName()</code>, where <code>name</code> is @@ -469,10 +474,11 @@ public final class ObjectAnimator extends ValueAnimator { /** * Constructs and returns an ObjectAnimator that animates between float values. A single - * value implies that that value is the one being animated to. Two values imply starting - * and ending values. More than two values imply a starting value, values to animate through - * along the way, and an ending value (these values will be distributed evenly across - * the duration of the animation). + * value implies that that value is the one being animated to, in which case the start value + * will be derived from the property being animated and the target object when {@link #start()} + * is called for the first time. Two values imply starting and ending values. More than two + * values imply a starting value, values to animate through along the way, and an ending value + * (these values will be distributed evenly across the duration of the animation). * * @param target The object whose property is to be animated. * @param property The property being animated. @@ -580,10 +586,11 @@ public final class ObjectAnimator extends ValueAnimator { /** * Constructs and returns an ObjectAnimator that animates between Object values. A single - * value implies that that value is the one being animated to. Two values imply starting - * and ending values. More than two values imply a starting value, values to animate through - * along the way, and an ending value (these values will be distributed evenly across - * the duration of the animation). + * value implies that that value is the one being animated to, in which case the start value + * will be derived from the property being animated and the target object when {@link #start()} + * is called for the first time. Two values imply starting and ending values. More than two + * values imply a starting value, values to animate through along the way, and an ending value + * (these values will be distributed evenly across the duration of the animation). * * <p><strong>Note:</strong> The values are stored as references to the original * objects, which means that changes to those objects after this method is called will @@ -635,10 +642,11 @@ public final class ObjectAnimator extends ValueAnimator { /** * Constructs and returns an ObjectAnimator that animates between Object values. A single - * value implies that that value is the one being animated to. Two values imply starting - * and ending values. More than two values imply a starting value, values to animate through - * along the way, and an ending value (these values will be distributed evenly across - * the duration of the animation). + * value implies that that value is the one being animated to, in which case the start value + * will be derived from the property being animated and the target object when {@link #start()} + * is called for the first time. Two values imply starting and ending values. More than two + * values imply a starting value, values to animate through along the way, and an ending value + * (these values will be distributed evenly across the duration of the animation). * * <p><strong>Note:</strong> The values are stored as references to the original * objects, which means that changes to those objects after this method is called will @@ -665,12 +673,13 @@ public final class ObjectAnimator extends ValueAnimator { /** * Constructs and returns an ObjectAnimator that animates between Object values. A single - * value implies that that value is the one being animated to. Two values imply starting - * and ending values. More than two values imply a starting value, values to animate through - * along the way, and an ending value (these values will be distributed evenly across - * the duration of the animation). This variant supplies a <code>TypeConverter</code> to - * convert from the animated values to the type of the property. If only one value is - * supplied, the <code>TypeConverter</code> must be a + * value implies that that value is the one being animated to, in which case the start value + * will be derived from the property being animated and the target object when {@link #start()} + * is called for the first time. Two values imply starting and ending values. More than two + * values imply a starting value, values to animate through along the way, and an ending value + * (these values will be distributed evenly across the duration of the animation). + * This variant supplies a <code>TypeConverter</code> to convert from the animated values to the + * type of the property. If only one value is supplied, the <code>TypeConverter</code> must be a * {@link android.animation.BidirectionalTypeConverter} to retrieve the current value. * * <p><strong>Note:</strong> The values are stored as references to the original diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 6d405f6bbd0e..ac5f3effa1f9 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -5948,7 +5948,7 @@ public class Activity extends ContextThemeWrapper * @return true if this is the topmost, non-finishing activity in its task. */ private boolean isTopOfTask() { - if (mToken == null || mWindow == null || !mWindowAdded) { + if (mToken == null || mWindow == null) { return false; } try { diff --git a/core/java/android/app/ActivityManagerInternal.java b/core/java/android/app/ActivityManagerInternal.java index 4b8d9ee37cc6..3a70a4cd4b99 100644 --- a/core/java/android/app/ActivityManagerInternal.java +++ b/core/java/android/app/ActivityManagerInternal.java @@ -18,6 +18,7 @@ package android.app; import android.annotation.NonNull; import android.content.ComponentName; +import android.content.IIntentSender; import android.os.IBinder; import android.service.voice.IVoiceInteractionSession; @@ -144,4 +145,10 @@ public abstract class ActivityManagerInternal { * Kill foreground apps from the specified user. */ public abstract void killForegroundAppsForUser(int userHandle); + + /** + * Sets how long a {@link PendingIntent} can be temporarily whitelist to by bypass restrictions + * such as Power Save mode. + */ + public abstract void setPendingIntentWhitelistDuration(IIntentSender target, long duration); } diff --git a/core/java/android/app/ActivityManagerNative.java b/core/java/android/app/ActivityManagerNative.java index cd9a05b7bf0f..f12c284d68ff 100644 --- a/core/java/android/app/ActivityManagerNative.java +++ b/core/java/android/app/ActivityManagerNative.java @@ -6966,8 +6966,8 @@ class ActivityManagerProxy implements IActivityManager reply.recycle(); } - public void notifyLockedProfile(@UserIdInt int userId) throws RemoteException - { + @Override + public void notifyLockedProfile(@UserIdInt int userId) throws RemoteException { Parcel data = Parcel.obtain(); Parcel reply = Parcel.obtain(); data.writeInterfaceToken(IActivityManager.descriptor); @@ -6978,6 +6978,7 @@ class ActivityManagerProxy implements IActivityManager reply.recycle(); } + @Override public void startConfirmDeviceCredentialIntent(Intent intent) throws RemoteException { Parcel data = Parcel.obtain(); Parcel reply = Parcel.obtain(); @@ -6989,6 +6990,7 @@ class ActivityManagerProxy implements IActivityManager reply.recycle(); } + @Override public int sendIntentSender(IIntentSender target, int code, Intent intent, String resolvedType, IIntentReceiver finishedReceiver, String requiredPermission, Bundle options) throws RemoteException { diff --git a/core/java/android/app/ActivityTransitionState.java b/core/java/android/app/ActivityTransitionState.java index 4a1aff74ddf6..02eb4d3ded1c 100644 --- a/core/java/android/app/ActivityTransitionState.java +++ b/core/java/android/app/ActivityTransitionState.java @@ -284,7 +284,7 @@ class ActivityTransitionState { } public boolean startExitBackTransition(final Activity activity) { - if (mEnteringNames == null) { + if (mEnteringNames == null || mCalledExitCoordinator != null) { return false; } else { if (!mHasExited) { diff --git a/core/java/android/app/AlarmManager.java b/core/java/android/app/AlarmManager.java index 02dcc5c7e3bd..c561a1908b21 100644 --- a/core/java/android/app/AlarmManager.java +++ b/core/java/android/app/AlarmManager.java @@ -28,12 +28,12 @@ import android.os.RemoteException; import android.os.UserHandle; import android.os.WorkSource; import android.text.TextUtils; +import android.util.ArrayMap; import android.util.Log; import libcore.util.ZoneInfoDB; import java.io.IOException; -import java.util.WeakHashMap; /** * This class provides access to the system alarm services. These allow you @@ -244,7 +244,7 @@ public class AlarmManager { // Tracking of the OnAlarmListener -> wrapper mapping, for cancel() support. // Access is synchronized on the AlarmManager class object. - private static WeakHashMap<OnAlarmListener, ListenerWrapper> sWrappers; + private static ArrayMap<OnAlarmListener, ListenerWrapper> sWrappers; /** * package private on purpose @@ -606,6 +606,22 @@ public class AlarmManager { * * @hide */ + public void set(int type, long triggerAtMillis, long windowMillis, long intervalMillis, + String tag, OnAlarmListener listener, Handler targetHandler, WorkSource workSource) { + setImpl(type, triggerAtMillis, windowMillis, intervalMillis, 0, null, listener, tag, + targetHandler, workSource, null); + } + + /** + * Direct callback version of {@link #set(int, long, long, long, PendingIntent, WorkSource)}. + * Note that repeating alarms must use the PendingIntent variant, not an OnAlarmListener. + * <p> + * The OnAlarmListener's {@link OnAlarmListener#onAlarm() onAlarm()} method will be + * invoked via the specified target Handler, or on the application's main looper + * if {@code null} is passed as the {@code targetHandler} parameter. + * + * @hide + */ @SystemApi public void set(int type, long triggerAtMillis, long windowMillis, long intervalMillis, OnAlarmListener listener, Handler targetHandler, WorkSource workSource) { @@ -631,7 +647,7 @@ public class AlarmManager { if (listener != null) { synchronized (AlarmManager.class) { if (sWrappers == null) { - sWrappers = new WeakHashMap<OnAlarmListener, ListenerWrapper>(); + sWrappers = new ArrayMap<OnAlarmListener, ListenerWrapper>(); } recipientWrapper = sWrappers.get(listener); diff --git a/core/java/android/app/AppOpsManager.java b/core/java/android/app/AppOpsManager.java index c62c1115fe81..e526c17dde9d 100644 --- a/core/java/android/app/AppOpsManager.java +++ b/core/java/android/app/AppOpsManager.java @@ -717,7 +717,7 @@ public class AppOpsManager { UserManager.DISALLOW_UNMUTE_MICROPHONE, // MUTE_MICROPHONE UserManager.DISALLOW_CREATE_WINDOWS, // TOAST_WINDOW null, //PROJECT_MEDIA - UserManager.DISALLOW_CONFIG_VPN, // ACTIVATE_VPN + null, // ACTIVATE_VPN UserManager.DISALLOW_WALLPAPER, // WRITE_WALLPAPER null, // ASSIST_STRUCTURE null, // ASSIST_SCREENSHOT diff --git a/core/java/android/app/EnterTransitionCoordinator.java b/core/java/android/app/EnterTransitionCoordinator.java index a5995846014e..8bf1e9a97e48 100644 --- a/core/java/android/app/EnterTransitionCoordinator.java +++ b/core/java/android/app/EnterTransitionCoordinator.java @@ -150,6 +150,7 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator { } }; decor.getViewTreeObserver().addOnPreDrawListener(mViewsReadyListener); + decor.invalidate(); } } diff --git a/core/java/android/app/LoadedApk.java b/core/java/android/app/LoadedApk.java index 1f3dfa729a92..152f45e35287 100644 --- a/core/java/android/app/LoadedApk.java +++ b/core/java/android/app/LoadedApk.java @@ -543,12 +543,7 @@ public final class LoadedApk { // It is NOT ok to call this function from the system_server (for any of the packages it // loads code from) so we explicitly disallow it there. if (needToSetupJitProfiles && !ActivityThread.isSystem()) { - // Temporarily disable logging of disk reads/writes on the Looper thread - // as this is early and necessary. Write is only needed to create the - // profile file if it's not already there. - StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites(); setupJitProfileSupport(); - StrictMode.setThreadPolicy(oldPolicy); } } @@ -572,6 +567,15 @@ public final class LoadedApk { if (!SystemProperties.getBoolean("dalvik.vm.usejitprofiles", false)) { return; } + // Only set up profile support if the loaded apk has the same uid as the + // current process. + // Currently, we do not support profiling across different apps. + // (e.g. application's uid might be different when the code is + // loaded by another app via createApplicationContext) + if (mApplicationInfo.uid != Process.myUid()) { + return; + } + final List<String> codePaths = new ArrayList<>(); if ((mApplicationInfo.flags & ApplicationInfo.FLAG_HAS_CODE) != 0) { codePaths.add(mApplicationInfo.sourceDir); @@ -587,55 +591,11 @@ public final class LoadedApk { } final File profileFile = getPrimaryProfileFile(mPackageName); - if (profileFile.exists()) { - if (!profileFile.canRead() || !profileFile.canWrite()) { - // The apk might be loaded in a context where we don't have permissions - // to track the profile (e.g. when loaded by another app via - // createApplicationContext) - return; - } - } else { - // Profile does not exist. Create it. - FileDescriptor fd = null; - try { - final int permissions = 0600; // read-write for user. - fd = Os.open(profileFile.getAbsolutePath(), OsConstants.O_CREAT, permissions); - Os.fchmod(fd, permissions); - Os.fchown(fd, mApplicationInfo.uid, mApplicationInfo.uid); - } catch (ErrnoException e) { - if (e.errno == OsConstants.EACCES) { - // It can happen that the profile file does not exist but the apk is loaded in a - // context where we don't have permissions (e.g. when loaded by another app via - // createApplicationContext) - return; - } - Log.v(TAG, "Unable to create jit profile file " - + profileFile + ": " + e.getMessage()); - try { - Os.unlink(profileFile.getAbsolutePath()); - } catch (ErrnoException unlinkErr) { - if (unlinkErr.errno != OsConstants.ENOENT) { - Log.v(TAG, "Unable to unlink jit profile file " - + profileFile + ": " + unlinkErr.getMessage()); - } - } - return; - } finally { - IoUtils.closeQuietly(fd); - } - } - final File foreignDexProfilesFile = Environment.getDataProfilesDeForeignDexDirectory(UserHandle.myUserId()); - String foreignDexProfilesPath = null; - if (!foreignDexProfilesFile.exists()) { - Log.v(TAG, "ForeignDexProfilesPath does not exists:" + - foreignDexProfilesFile.getPath()); - } else { - foreignDexProfilesPath = foreignDexProfilesFile.getAbsolutePath(); - } - VMRuntime.registerAppInfo(profileFile.getAbsolutePath(), mApplicationInfo.dataDir, - codePaths.toArray(new String[codePaths.size()]), foreignDexProfilesPath); + + VMRuntime.registerAppInfo(profileFile.getPath(), mApplicationInfo.dataDir, + codePaths.toArray(new String[codePaths.size()]), foreignDexProfilesFile.getPath()); } /** diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 0cc44e768dac..83a20668b3b4 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -4323,18 +4323,23 @@ public class Notification implements Parcelable // experience bigTextText = mBuilder.processLegacyText(text); } + applyBigTextContentView(mBuilder, contentView, bigTextText); + + return contentView; + } + + static void applyBigTextContentView(Builder builder, + RemoteViews contentView, CharSequence bigTextText) { contentView.setTextViewText(R.id.big_text, bigTextText); contentView.setViewVisibility(R.id.big_text, TextUtils.isEmpty(bigTextText) ? View.GONE : View.VISIBLE); - contentView.setInt(R.id.big_text, "setMaxLines", calculateMaxLines()); - contentView.setBoolean(R.id.big_text, "setHasImage", mBuilder.mN.mLargeIcon != null); - - return contentView; + contentView.setInt(R.id.big_text, "setMaxLines", calculateMaxLines(builder)); + contentView.setBoolean(R.id.big_text, "setHasImage", builder.mN.mLargeIcon != null); } - private int calculateMaxLines() { + private static int calculateMaxLines(Builder builder) { int lineCount = MAX_LINES; - boolean hasActions = mBuilder.mActions.size() > 0; + boolean hasActions = builder.mActions.size() > 0; if (hasActions) { lineCount -= LINES_CONSUMED_BY_ACTIONS; } @@ -4474,6 +4479,35 @@ public class Notification implements Parcelable if (!mMessages.isEmpty()) { extras.putParcelableArray(EXTRA_MESSAGES, Message.getBundleArrayForMessages(mMessages)); } + + fixTitleAndTextExtras(extras); + } + + private void fixTitleAndTextExtras(Bundle extras) { + Message m = findLatestIncomingMessage(); + CharSequence text = (m == null) ? null : m.mText; + CharSequence sender = m == null ? null + : TextUtils.isEmpty(m.mSender) ? mUserDisplayName : m.mSender; + CharSequence title; + if (!TextUtils.isEmpty(mConversationTitle)) { + if (!TextUtils.isEmpty(sender)) { + BidiFormatter bidi = BidiFormatter.getInstance(); + title = mBuilder.mContext.getString( + com.android.internal.R.string.notification_messaging_title_template, + bidi.unicodeWrap(mConversationTitle), bidi.unicodeWrap(m.mSender)); + } else { + title = mConversationTitle; + } + } else { + title = sender; + } + + if (title != null) { + extras.putCharSequence(EXTRA_TITLE, title); + } + if (text != null) { + extras.putCharSequence(EXTRA_TEXT, text); + } } /** @@ -4519,6 +4553,10 @@ public class Notification implements Parcelable return m; } } + if (!mMessages.isEmpty()) { + // No incoming messages, fall back to outgoing message + return mMessages.get(mMessages.size() - 1); + } return null; } @@ -4532,6 +4570,16 @@ public class Notification implements Parcelable : mConversationTitle; boolean hasTitle = !TextUtils.isEmpty(title); + if (!hasTitle && mMessages.size() == 1) { + CharSequence sender = mMessages.get(0).mSender; + CharSequence text = mMessages.get(0).mText; + RemoteViews contentView = mBuilder.applyStandardTemplateWithActions( + mBuilder.getBigTextLayoutResource(), + false /* progress */, sender, null /* text */); + BigTextStyle.applyBigTextContentView(mBuilder, contentView, text); + return contentView; + } + RemoteViews contentView = mBuilder.applyStandardTemplateWithActions( mBuilder.getMessagingLayoutResource(), false /* hasProgress */, diff --git a/core/java/android/app/ResourcesManager.java b/core/java/android/app/ResourcesManager.java index 25a8b66a42aa..31d254dc5b2b 100644 --- a/core/java/android/app/ResourcesManager.java +++ b/core/java/android/app/ResourcesManager.java @@ -29,7 +29,6 @@ import android.content.res.ResourcesImpl; import android.content.res.ResourcesKey; import android.hardware.display.DisplayManagerGlobal; import android.os.IBinder; -import android.os.LocaleList; import android.os.Trace; import android.util.ArrayMap; import android.util.DisplayMetrics; @@ -38,13 +37,12 @@ import android.util.Pair; import android.util.Slog; import android.view.Display; import android.view.DisplayAdjustments; + import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.ArrayUtils; import java.lang.ref.WeakReference; import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; import java.util.Objects; import java.util.WeakHashMap; import java.util.function.Predicate; @@ -120,6 +118,30 @@ public class ResourcesManager { } } + /** + * Invalidate and destroy any resources that reference content under the + * given filesystem path. Typically used when unmounting a storage device to + * try as hard as possible to release any open FDs. + */ + public void invalidatePath(String path) { + synchronized (this) { + int count = 0; + for (int i = 0; i < mResourceImpls.size();) { + final ResourcesKey key = mResourceImpls.keyAt(i); + if (key.isPathReferenced(path)) { + final ResourcesImpl res = mResourceImpls.removeAt(i).get(); + if (res != null) { + res.flushLayoutCache(); + } + count++; + } else { + i++; + } + } + Log.i(TAG, "Invalidated " + count + " asset managers that referenced " + path); + } + } + public Configuration getConfiguration() { synchronized (this) { return mResConfiguration; diff --git a/core/java/android/app/job/JobInfo.java b/core/java/android/app/job/JobInfo.java index 61790ea92ed9..c4ca82e59b99 100644 --- a/core/java/android/app/job/JobInfo.java +++ b/core/java/android/app/job/JobInfo.java @@ -192,7 +192,8 @@ public class JobInfo implements Parcelable { private final int flags; /** - * Unique job id associated with this class. This is assigned to your job by the scheduler. + * Unique job id associated with this application (uid). This is the same job ID + * you supplied in the {@link Builder} constructor. */ public int getId() { return jobId; @@ -524,9 +525,9 @@ public class JobInfo implements Parcelable { /** Builder class for constructing {@link JobInfo} objects. */ public static final class Builder { - private int mJobId; + private final int mJobId; + private final ComponentName mJobService; private PersistableBundle mExtras = PersistableBundle.EMPTY; - private ComponentName mJobService; private int mPriority = PRIORITY_DEFAULT; private int mFlags; // Requirements. @@ -553,11 +554,15 @@ public class JobInfo implements Parcelable { private boolean mBackoffPolicySet = false; /** + * Initialize a new Builder to construct a {@link JobInfo}. + * * @param jobId Application-provided id for this job. Subsequent calls to cancel, or - * jobs created with the same jobId, will update the pre-existing job with - * the same id. + * jobs created with the same jobId, will update the pre-existing job with + * the same id. This ID must be unique across all clients of the same uid + * (not just the same package). You will want to make sure this is a stable + * id across app updates, so probably not based on a resource ID. * @param jobService The endpoint that you implement that will receive the callback from the - * JobScheduler. + * JobScheduler. */ public Builder(int jobId, ComponentName jobService) { mJobService = jobService; @@ -635,6 +640,13 @@ public class JobInfo implements Parcelable { * <p>Because because setting this property is not compatible with periodic or * persisted jobs, doing so will throw an {@link java.lang.IllegalArgumentException} when * {@link android.app.job.JobInfo.Builder#build()} is called.</p> + * + * <p>The following example shows how this feature can be used to monitor for changes + * in the photos on a device.</p> + * + * {@sample development/samples/ApiDemos/src/com/example/android/apis/content/PhotosContentJob.java + * job} + * * @param uri The content: URI to monitor. */ public Builder addTriggerContentUri(@NonNull TriggerContentUri uri) { diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index b7588687a8e4..108350a2b9ce 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -285,6 +285,12 @@ public abstract class Context { public static final int BIND_ADJUST_WITH_ACTIVITY = 0x0080; /** + * @hide Flag for {@link #bindService}: allows application hosting service to manage whitelists + * such as temporary allowing a {@code PendingIntent} to bypass Power Save mode. + */ + public static final int BIND_ALLOW_WHITELIST_MANAGEMENT = 0x01000000; + + /** * @hide Flag for {@link #bindService}: Like {@link #BIND_FOREGROUND_SERVICE}, * but only applies while the device is awake. */ diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl index 03f83d622cde..11f0eb626964 100644 --- a/core/java/android/content/pm/IPackageManager.aidl +++ b/core/java/android/content/pm/IPackageManager.aidl @@ -459,23 +459,19 @@ interface IPackageManager { /** * Ask the package manager to perform dex-opt (if needed) on the given - * package and for the given instruction set if it already hasn't done - * so. - * - * If the supplied instructionSet is null, the package manager will use - * the packages default instruction set. + * package if it already hasn't done so. * * In most cases, apps are dexopted in advance and this function will * be a no-op. */ - boolean performDexOptIfNeeded(String packageName, String instructionSet); + boolean performDexOptIfNeeded(String packageName); /** * Ask the package manager to perform a dex-opt for the given reason. The package * manager will map the reason to a compiler filter according to the current system * configuration. */ - boolean performDexOpt(String packageName, String instructionSet, boolean checkProfiles, + boolean performDexOpt(String packageName, boolean checkProfiles, int compileReason, boolean force); /** * Ask the package manager to perform a dex-opt with the given compiler filter. @@ -483,9 +479,14 @@ interface IPackageManager { * Note: exposed only for the shell command to allow moving packages explicitly to a * definite state. */ - boolean performDexOptMode(String packageName, String instructionSet, boolean checkProfiles, + boolean performDexOptMode(String packageName, boolean checkProfiles, String targetCompilerFilter, boolean force); + /** + * Ask the package manager to dump profiles associated with a package. + */ + void dumpProfiles(String packageName); + void forceDexOpt(String packageName); /** diff --git a/core/java/android/content/pm/PackageItemInfo.java b/core/java/android/content/pm/PackageItemInfo.java index edd888b33b1e..30da03cc773b 100644 --- a/core/java/android/content/pm/PackageItemInfo.java +++ b/core/java/android/content/pm/PackageItemInfo.java @@ -25,6 +25,7 @@ import android.os.Bundle; import android.os.Parcel; import android.os.UserHandle; import android.text.BidiFormatter; +import android.text.Html; import android.text.TextPaint; import android.text.TextUtils; import android.util.Printer; @@ -164,12 +165,13 @@ public class PackageItemInfo { @SystemApi public @NonNull CharSequence loadSafeLabel(@NonNull PackageManager pm) { // loadLabel() always returns non-null - CharSequence label = loadLabel(pm); + String label = loadLabel(pm).toString(); + // strip HTML tags to avoid <br> and other tags overwriting original message + String labelStr = Html.fromHtml(label).toString(); // If the label contains new line characters it may push the UI // down to hide a part of it. Labels shouldn't have new line // characters, so just truncate at the first time one is seen. - String labelStr = label.toString(); final int labelLength = labelStr.length(); int offset = 0; while (offset < labelLength) { @@ -181,13 +183,18 @@ public class PackageItemInfo { labelStr = labelStr.substring(0, offset); break; } + // replace all non-break space to " " in order to be trimmed + if (type == Character.SPACE_SEPARATOR) { + labelStr = labelStr.substring(0, offset) + " " + labelStr.substring(offset + + Character.charCount(codePoint)); + } offset += Character.charCount(codePoint); } + labelStr = labelStr.trim(); if (labelStr.isEmpty()) { - return labelStr; + return packageName; } - TextPaint paint = new TextPaint(); paint.setTextSize(42); diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java index f6445e6cd090..6f43d99ecb95 100644 --- a/core/java/android/content/res/Configuration.java +++ b/core/java/android/content/res/Configuration.java @@ -207,7 +207,7 @@ public final class Configuration implements Parcelable, Comparable<Configuration public static final int SCREENLAYOUT_COMPAT_NEEDED = 0x10000000; /** - * Bit mask of overall layout of the screen. Currently there are two + * Bit mask of overall layout of the screen. Currently there are four * fields: * <p>The {@link #SCREENLAYOUT_SIZE_MASK} bits define the overall size * of the screen. They may be one of diff --git a/core/java/android/content/res/ResourcesImpl.java b/core/java/android/content/res/ResourcesImpl.java index 32a27951677a..000751e88639 100644 --- a/core/java/android/content/res/ResourcesImpl.java +++ b/core/java/android/content/res/ResourcesImpl.java @@ -292,8 +292,10 @@ public class ResourcesImpl { return mAssets.openNonAsset(value.assetCookie, value.string.toString(), AssetManager.ACCESS_STREAMING); } catch (Exception e) { - NotFoundException rnf = new NotFoundException("File " + value.string.toString() + - " from drawable resource ID #0x" + Integer.toHexString(id)); + // Note: value.string might be null + NotFoundException rnf = new NotFoundException("File " + + (value.string == null ? "(null)" : value.string.toString()) + + " from drawable resource ID #0x" + Integer.toHexString(id)); rnf.initCause(e); throw rnf; } diff --git a/core/java/android/content/res/ResourcesKey.java b/core/java/android/content/res/ResourcesKey.java index e89449283c5e..64b6bf1b6dcd 100644 --- a/core/java/android/content/res/ResourcesKey.java +++ b/core/java/android/content/res/ResourcesKey.java @@ -77,6 +77,26 @@ public final class ResourcesKey { return !Configuration.EMPTY.equals(mOverrideConfiguration); } + public boolean isPathReferenced(String path) { + if (mResDir != null && mResDir.startsWith(path)) { + return true; + } else { + return anyStartsWith(mSplitResDirs, path) || anyStartsWith(mOverlayDirs, path) + || anyStartsWith(mLibDirs, path); + } + } + + private static boolean anyStartsWith(String[] list, String prefix) { + if (list != null) { + for (String s : list) { + if (s != null && s.startsWith(prefix)) { + return true; + } + } + } + return false; + } + @Override public int hashCode() { return mHash; diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index f9049dbd5fce..23f4b9e6ce06 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -3547,10 +3547,21 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * <p>The shading map is a low-resolution floating-point map * that lists the coefficients used to correct for vignetting, for each * Bayer color channel.</p> - * <p>The least shaded section of the image should have a gain factor - * of 1; all other sections should have gains above 1.</p> + * <p>The map provided here is the same map that is used by the camera device to + * correct both color shading and vignetting for output non-RAW images.</p> + * <p>When there is no lens shading correction applied to RAW + * output images ({@link CameraCharacteristics#SENSOR_INFO_LENS_SHADING_APPLIED android.sensor.info.lensShadingApplied} <code>==</code> + * false), this map is the complete lens shading correction + * map; when there is some lens shading correction applied to + * the RAW output image ({@link CameraCharacteristics#SENSOR_INFO_LENS_SHADING_APPLIED android.sensor.info.lensShadingApplied}<code>==</code> true), this map reports the remaining lens shading + * correction map that needs to be applied to get shading + * corrected images that match the camera device's output for + * non-RAW formats.</p> + * <p>For a complete shading correction map, the least shaded + * section of the image will have a gain factor of 1; all + * other sections will have gains above 1.</p> * <p>When {@link CaptureRequest#COLOR_CORRECTION_MODE android.colorCorrection.mode} = TRANSFORM_MATRIX, the map - * must take into account the colorCorrection settings.</p> + * will take into account the colorCorrection settings.</p> * <p>The shading map is for the entire active pixel array, and is not * affected by the crop region specified in the request. Each shading map * entry is the value of the shading compensation map over a specific @@ -3562,8 +3573,8 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * <p>The channel order is [R, Geven, Godd, B], where Geven is the green * channel for the even rows of a Bayer pattern, and Godd is the odd rows. * The shading map is stored in a fully interleaved format.</p> - * <p>The shading map should have on the order of 30-40 rows and columns, - * and must be smaller than 64x64.</p> + * <p>The shading map will generally have on the order of 30-40 rows and columns, + * and will be smaller than 64x64.</p> * <p>As an example, given a very small map defined as:</p> * <pre><code>width,height = [ 4, 3 ] * values = @@ -3592,6 +3603,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * * @see CaptureRequest#COLOR_CORRECTION_MODE * @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL + * @see CameraCharacteristics#SENSOR_INFO_LENS_SHADING_APPLIED */ @PublicKey public static final Key<android.hardware.camera2.params.LensShadingMap> STATISTICS_LENS_SHADING_CORRECTION_MAP = @@ -3601,20 +3613,21 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * <p>The shading map is a low-resolution floating-point map * that lists the coefficients used to correct for vignetting and color shading, * for each Bayer color channel of RAW image data.</p> - * <p>The lens shading correction is defined as a full shading correction that - * corrects both color shading for the output non-RAW images. After the - * shading map is applied, the output non-RAW images will be flat-field images - * for flat scenes under uniform illumination.</p> - * <p>When there is no lens shading correction applied to RAW output images - * ({@link CameraCharacteristics#SENSOR_INFO_LENS_SHADING_APPLIED android.sensor.info.lensShadingApplied} <code>==</code> false), this map is a full lens - * shading correction map; when there is some lens shading correction applied - * to the RAW output image ({@link CameraCharacteristics#SENSOR_INFO_LENS_SHADING_APPLIED android.sensor.info.lensShadingApplied} <code>==</code> true), - * this map reports the remaining lens shading correction map that needs to be - * applied to get fully shading corrected images.</p> - * <p>For a full shading correction map, the least shaded section of the image - * should have a gain factor of 1; all other sections should have gains above 1.</p> + * <p>The map provided here is the same map that is used by the camera device to + * correct both color shading and vignetting for output non-RAW images.</p> + * <p>When there is no lens shading correction applied to RAW + * output images ({@link CameraCharacteristics#SENSOR_INFO_LENS_SHADING_APPLIED android.sensor.info.lensShadingApplied} <code>==</code> + * false), this map is the complete lens shading correction + * map; when there is some lens shading correction applied to + * the RAW output image ({@link CameraCharacteristics#SENSOR_INFO_LENS_SHADING_APPLIED android.sensor.info.lensShadingApplied}<code>==</code> true), this map reports the remaining lens shading + * correction map that needs to be applied to get shading + * corrected images that match the camera device's output for + * non-RAW formats.</p> + * <p>For a complete shading correction map, the least shaded + * section of the image will have a gain factor of 1; all + * other sections will have gains above 1.</p> * <p>When {@link CaptureRequest#COLOR_CORRECTION_MODE android.colorCorrection.mode} = TRANSFORM_MATRIX, the map - * must take into account the colorCorrection settings.</p> + * will take into account the colorCorrection settings.</p> * <p>The shading map is for the entire active pixel array, and is not * affected by the crop region specified in the request. Each shading map * entry is the value of the shading compensation map over a specific @@ -3627,8 +3640,8 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { * channel for the even rows of a Bayer pattern, and Godd is the odd rows. * The shading map is stored in a fully interleaved format, and its size * is provided in the camera static metadata by android.lens.info.shadingMapSize.</p> - * <p>The shading map should have on the order of 30-40 rows and columns, - * and must be smaller than 64x64.</p> + * <p>The shading map will generally have on the order of 30-40 rows and columns, + * and will be smaller than 64x64.</p> * <p>As an example, given a very small map defined as:</p> * <pre><code>android.lens.info.shadingMapSize = [ 4, 3 ] * android.statistics.lensShadingMap = diff --git a/core/java/android/net/PacProxySelector.java b/core/java/android/net/PacProxySelector.java index 9bdf4f6db8e6..85bf79ab3d69 100644 --- a/core/java/android/net/PacProxySelector.java +++ b/core/java/android/net/PacProxySelector.java @@ -30,6 +30,7 @@ import java.net.Proxy.Type; import java.net.ProxySelector; import java.net.SocketAddress; import java.net.URI; +import java.net.URISyntaxException; import java.util.List; /** @@ -67,7 +68,15 @@ public class PacProxySelector extends ProxySelector { String response = null; String urlString; try { + // Strip path and username/password from URI so it's not visible to PAC script. The + // path often contains credentials the app does not want exposed to a potentially + // malicious PAC script. + if (!"http".equalsIgnoreCase(uri.getScheme())) { + uri = new URI(uri.getScheme(), null, uri.getHost(), uri.getPort(), "/", null, null); + } urlString = uri.toURL().toString(); + } catch (URISyntaxException e) { + urlString = uri.getHost(); } catch (MalformedURLException e) { urlString = uri.getHost(); } diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java index c285acbc271b..ce7a1243fe7a 100644 --- a/core/java/android/os/PowerManager.java +++ b/core/java/android/os/PowerManager.java @@ -1021,9 +1021,19 @@ public final class PowerManager { } /** - * Returns True if the device supports Sustained Performance Mode. - * Applications Should check if the device supports this mode, before - * using {@link android.view.Window#setSustainedPerformanceMode}. + * This function checks if the device has implemented Sustained Performance + * Mode. This needs to be checked only once and is constant for a particular + * device/release. + * + * Sustained Performance Mode is intended to provide a consistent level of + * performance for prolonged amount of time. + * + * Applications should check if the device supports this mode, before using + * {@link android.view.Window#setSustainedPerformanceMode}. + * + * @return Returns True if the device supports it, false otherwise. + * + * @see android.view.Window#setSustainedPerformanceMode */ public boolean isSustainedPerformanceModeSupported() { return mContext.getResources().getBoolean( diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index dcec98246ab6..f3dc43237a4d 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -924,6 +924,7 @@ public class UserManager { /** {@hide} */ public boolean isUserRunning(int userId) { + // TODO Switch to using UMS internal isUserRunning try { return ActivityManagerNative.getDefault().isUserRunning(userId, 0); } catch (RemoteException re) { diff --git a/core/java/android/os/UserManagerInternal.java b/core/java/android/os/UserManagerInternal.java index 551ea6b6c469..93afb4376cf2 100644 --- a/core/java/android/os/UserManagerInternal.java +++ b/core/java/android/os/UserManagerInternal.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2016 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -11,7 +11,7 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and - * limitations under the License. + * limitations under the License */ package android.os; @@ -129,15 +129,23 @@ public abstract class UserManagerInternal { /** * Return whether the given user is running in an - * {@link com.android.server.am.UserState#STATE_RUNNING_UNLOCKING "unlocking"} or - * {@link com.android.server.am.UserState#STATE_RUNNING_UNLOCKED "unlocked"} state. + * {@code UserState.STATE_RUNNING_UNLOCKING} or + * {@code UserState.STATE_RUNNING_UNLOCKED} state. */ public abstract boolean isUserUnlockingOrUnlocked(int userId); /** - * Sets whether the given user is running in an - * {@link com.android.server.am.UserState#STATE_RUNNING_UNLOCKING "unlocking"} or - * {@link com.android.server.am.UserState#STATE_RUNNING_UNLOCKED "unlocked"} state. + * Return whether the given user is running */ - public abstract void setUserUnlockingOrUnlocked(int userId, boolean unlockingOrUnlocked); + public abstract boolean isUserRunning(int userId); + + /** + * Set user's running state + */ + public abstract void setUserState(int userId, int userState); + + /** + * Remove user's running state + */ + public abstract void removeUserState(int userId); } diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java index fbf7b266330b..485bbd105603 100644 --- a/core/java/android/os/storage/StorageManager.java +++ b/core/java/android/os/storage/StorageManager.java @@ -114,6 +114,8 @@ public class StorageManager { /** {@hide} */ public static final int FLAG_INCLUDE_INVISIBLE = 1 << 10; + private static volatile IMountService sMountService = null; + private final Context mContext; private final ContentResolver mResolver; @@ -1064,15 +1066,17 @@ public class StorageManager { /** {@hide} */ public static boolean isUserKeyUnlocked(int userId) { - final IMountService mount = IMountService.Stub - .asInterface(ServiceManager.getService("mount")); - if (mount == null) { + if (sMountService == null) { + sMountService = IMountService.Stub + .asInterface(ServiceManager.getService("mount")); + } + if (sMountService == null) { Slog.w(TAG, "Early during boot, assuming locked"); return false; } final long token = Binder.clearCallingIdentity(); try { - return mount.isUserKeyUnlocked(userId); + return sMountService.isUserKeyUnlocked(userId); } catch (RemoteException e) { throw e.rethrowAsRuntimeException(); } finally { diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 0bc514ed0545..ab2506e7e9f7 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -60,8 +60,8 @@ import android.util.AndroidException; import android.util.ArrayMap; import android.util.ArraySet; import android.util.Log; - import android.util.MemoryIntArray; + import com.android.internal.annotations.GuardedBy; import com.android.internal.util.ArrayUtils; import com.android.internal.widget.ILockSettings; @@ -6250,7 +6250,6 @@ public final class Settings { ACCESSIBILITY_DISPLAY_MAGNIFICATION_AUTO_UPDATE, ACCESSIBILITY_SCRIPT_INJECTION, ACCESSIBILITY_WEB_CONTENT_KEY_BINDINGS, - BACKUP_AUTO_RESTORE, ENABLED_ACCESSIBILITY_SERVICES, ENABLED_NOTIFICATION_LISTENERS, ENABLED_VR_LISTENERS, @@ -7950,6 +7949,7 @@ public final class Settings { * idle_factor (float) * min_time_to_alarm (long) * max_temp_app_whitelist_duration (long) + * notification_whitelist_duration (long) * </pre> * * <p> @@ -8017,6 +8017,36 @@ public final class Settings { public static final String ALARM_MANAGER_CONSTANTS = "alarm_manager_constants"; /** + * Job scheduler specific settings. + * This is encoded as a key=value list, separated by commas. Ex: + * + * "min_ready_jobs_count=2,moderate_use_factor=.5" + * + * The following keys are supported: + * + * <pre> + * min_idle_count (int) + * min_charging_count (int) + * min_connectivity_count (int) + * min_content_count (int) + * min_ready_jobs_count (int) + * heavy_use_factor (float) + * moderate_use_factor (float) + * fg_job_count (int) + * bg_normal_job_count (int) + * bg_moderate_job_count (int) + * bg_low_job_count (int) + * bg_critical_job_count (int) + * </pre> + * + * <p> + * Type: string + * @hide + * @see com.android.server.job.JobSchedulerService.Constants + */ + public static final String JOB_SCHEDULER_CONSTANTS = "job_scheduler_constants"; + + /** * ShortcutManager specific settings. * This is encoded as a key=value list, separated by commas. Ex: * @@ -8950,6 +8980,14 @@ public final class Settings { * @hide */ public static final String ENABLE_CELLULAR_ON_BOOT = "enable_cellular_on_boot"; + + /** + * The maximum allowed notification enqueue rate in Hertz. + * + * Should be a float, and includes both posts and updates. + * @hide + */ + public static final String MAX_NOTIFICATION_ENQUEUE_RATE = "max_notification_enqueue_rate"; } /** diff --git a/core/java/android/service/voice/VoiceInteractionServiceInfo.java b/core/java/android/service/voice/VoiceInteractionServiceInfo.java index a9db32b703fa..e1a9a050212c 100644 --- a/core/java/android/service/voice/VoiceInteractionServiceInfo.java +++ b/core/java/android/service/voice/VoiceInteractionServiceInfo.java @@ -61,7 +61,11 @@ public class VoiceInteractionServiceInfo { throws PackageManager.NameNotFoundException { try { ServiceInfo si = AppGlobals.getPackageManager().getServiceInfo(comp, - PackageManager.GET_META_DATA, userHandle); + PackageManager.GET_META_DATA + | PackageManager.MATCH_DIRECT_BOOT_AWARE + | PackageManager.MATCH_DIRECT_BOOT_UNAWARE + | PackageManager.MATCH_DEBUG_TRIAGED_MISSING, + userHandle); if (si != null) { return si; } diff --git a/core/java/android/text/TextUtils.java b/core/java/android/text/TextUtils.java index 1c13962c7dfd..b8fd2ffc8e5e 100644 --- a/core/java/android/text/TextUtils.java +++ b/core/java/android/text/TextUtils.java @@ -67,7 +67,8 @@ public class TextUtils { private static final String TAG = "TextUtils"; /* package */ static final char[] ELLIPSIS_NORMAL = { '\u2026' }; // this is "..." - private static final String ELLIPSIS_STRING = new String(ELLIPSIS_NORMAL); + /** {@hide} */ + public static final String ELLIPSIS_STRING = new String(ELLIPSIS_NORMAL); /* package */ static final char[] ELLIPSIS_TWO_DOTS = { '\u2025' }; // this is ".." private static final String ELLIPSIS_TWO_DOTS_STRING = new String(ELLIPSIS_TWO_DOTS); diff --git a/core/java/android/util/KeyValueListParser.java b/core/java/android/util/KeyValueListParser.java index 4abdde00e6c6..e4c025dece49 100644 --- a/core/java/android/util/KeyValueListParser.java +++ b/core/java/android/util/KeyValueListParser.java @@ -63,6 +63,24 @@ public class KeyValueListParser { } /** + * Get the value for key as an int. + * @param key The key to lookup. + * @param def The value to return if the key was not found, or the value was not a long. + * @return the int value associated with the key. + */ + public int getInt(String key, int def) { + String value = mValues.get(key); + if (value != null) { + try { + return Integer.parseInt(value); + } catch (NumberFormatException e) { + // fallthrough + } + } + return def; + } + + /** * Get the value for key as a long. * @param key The key to lookup. * @param def The value to return if the key was not found, or the value was not a long. diff --git a/core/java/android/util/jar/StrictJarVerifier.java b/core/java/android/util/jar/StrictJarVerifier.java index 6da50ba85b37..cb71ecc1da8b 100644 --- a/core/java/android/util/jar/StrictJarVerifier.java +++ b/core/java/android/util/jar/StrictJarVerifier.java @@ -30,6 +30,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Hashtable; import java.util.Iterator; +import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Set; @@ -41,6 +42,7 @@ import android.util.apk.ApkSignatureSchemeV2Verifier; import libcore.io.Base64; import sun.security.jca.Providers; import sun.security.pkcs.PKCS7; +import sun.security.pkcs.SignerInfo; /** * Non-public class used by {@link JarFile} and {@link JarInputStream} to manage @@ -308,18 +310,29 @@ class StrictJarVerifier { obj = Providers.startJarVerification(); PKCS7 block = new PKCS7(blockBytes); - if (block.verify(sfBytes) == null) { - throw new GeneralSecurityException("Failed to verify signature"); + SignerInfo[] verifiedSignerInfos = block.verify(sfBytes); + if ((verifiedSignerInfos == null) || (verifiedSignerInfos.length == 0)) { + throw new GeneralSecurityException( + "Failed to verify signature: no verified SignerInfos"); } - X509Certificate[] blockCerts = block.getCertificates(); - Certificate[] signerCertChain = null; - if (blockCerts != null) { - signerCertChain = new Certificate[blockCerts.length]; - for (int i = 0; i < blockCerts.length; ++i) { - signerCertChain[i] = blockCerts[i]; - } + // Ignore any SignerInfo other than the first one, to be compatible with older Android + // platforms which have been doing this for years. See + // libcore/luni/src/main/java/org/apache/harmony/security/utils/JarUtils.java + // verifySignature method of older platforms. + SignerInfo verifiedSignerInfo = verifiedSignerInfos[0]; + List<X509Certificate> verifiedSignerCertChain = + verifiedSignerInfo.getCertificateChain(block); + if (verifiedSignerCertChain == null) { + // Should never happen + throw new GeneralSecurityException( + "Failed to find verified SignerInfo certificate chain"); + } else if (verifiedSignerCertChain.isEmpty()) { + // Should never happen + throw new GeneralSecurityException( + "Verified SignerInfo certificate chain is emtpy"); } - return signerCertChain; + return verifiedSignerCertChain.toArray( + new X509Certificate[verifiedSignerCertChain.size()]); } catch (IOException e) { throw new GeneralSecurityException("IO exception verifying jar cert", e); } finally { diff --git a/core/java/android/view/NotificationHeaderView.java b/core/java/android/view/NotificationHeaderView.java index 6e6baeadd45d..3069e5ade582 100644 --- a/core/java/android/view/NotificationHeaderView.java +++ b/core/java/android/view/NotificationHeaderView.java @@ -21,9 +21,9 @@ import android.content.Context; import android.graphics.Canvas; import android.graphics.Outline; import android.graphics.Rect; -import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.util.AttributeSet; +import android.view.accessibility.AccessibilityNodeInfo; import android.widget.ImageView; import android.widget.RemoteViews; @@ -230,6 +230,7 @@ public class NotificationHeaderView extends ViewGroup { public void setOnClickListener(@Nullable OnClickListener l) { mExpandClickListener = l; setOnTouchListener(mExpandClickListener != null ? mTouchListener : null); + setFocusable(l != null); updateTouchListener(); } @@ -379,6 +380,19 @@ public class NotificationHeaderView extends ViewGroup { return this; } + @Override + public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) { + super.onInitializeAccessibilityNodeInfo(info); + if (mExpandClickListener != null) { + AccessibilityNodeInfo.AccessibilityAction expand + = new AccessibilityNodeInfo.AccessibilityAction( + AccessibilityNodeInfo.ACTION_CLICK, + getContext().getString( + com.android.internal.R.string.expand_action_accessibility)); + info.addAction(expand); + } + } + public ImageView getExpandButton() { return mExpandButton; } diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 414882a3ed96..88605db0408a 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -22812,6 +22812,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback, boolean mKeepScreenOn; /** + * Set during a traveral if the light center needs to be updated. + */ + boolean mNeedsUpdateLightCenter; + + /** * Bitwise-or of all of the values that views have passed to setSystemUiVisibility(). */ int mSystemUiVisibility; diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index d812cb42c671..4742818d4be0 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -80,7 +80,6 @@ import android.view.accessibility.IAccessibilityInteractionConnection; import android.view.accessibility.IAccessibilityInteractionConnectionCallback; import android.view.animation.AccelerateDecelerateInterpolator; import android.view.animation.Interpolator; -import android.view.inputmethod.InputConnection; import android.view.inputmethod.InputMethodManager; import android.widget.Scroller; @@ -920,6 +919,11 @@ public final class ViewRootImpl implements ViewParent, // Recompute system ui visibility. mAttachInfo.mRecomputeGlobalAttributes = true; } + if ((mWindowAttributesChangesFlag + & WindowManager.LayoutParams.LAYOUT_CHANGED) != 0) { + // Request to update light center. + mAttachInfo.mNeedsUpdateLightCenter = true; + } if (mWindowAttributes.packageName == null) { mWindowAttributes.packageName = mBasePackageName; } @@ -2226,13 +2230,16 @@ public final class ViewRootImpl implements ViewParent, } mAttachInfo.mWindowLeft = frame.left; mAttachInfo.mWindowTop = frame.top; - - // Update the light position for the new window offsets. + } + if (windowMoved || mAttachInfo.mNeedsUpdateLightCenter) { + // Update the light position for the new offsets. if (mAttachInfo.mHardwareRenderer != null) { mAttachInfo.mHardwareRenderer.setLightCenter(mAttachInfo); } + mAttachInfo.mNeedsUpdateLightCenter = false; } } + private void handleOutOfResourcesException(Surface.OutOfResourcesException e) { Log.e(mTag, "OutOfResourcesException initializing HW surface", e); try { @@ -3071,16 +3078,22 @@ public final class ViewRootImpl implements ViewParent, // best is probably just to leave things as-is. if (DEBUG_INPUT_RESIZE) Log.v(mTag, "Too tall; leaving scrollY=" + scrollY); - } else if ((mTempRect.top-scrollY) < vi.top) { - scrollY -= vi.top - (mTempRect.top-scrollY); + } + // Next, check whether top or bottom is covered based on the non-scrolled + // position, and calculate new scrollY (or set it to 0). + // We can't keep using mScrollY here. For example mScrollY is non-zero + // due to IME, then IME goes away. The current value of mScrollY leaves top + // and bottom both visible, but we still need to scroll it back to 0. + else if (mTempRect.top < vi.top) { + scrollY = mTempRect.top - vi.top; if (DEBUG_INPUT_RESIZE) Log.v(mTag, "Top covered; scrollY=" + scrollY); - } else if ((mTempRect.bottom-scrollY) - > (mView.getHeight()-vi.bottom)) { - scrollY += (mTempRect.bottom-scrollY) - - (mView.getHeight()-vi.bottom); + } else if (mTempRect.bottom > (mView.getHeight()-vi.bottom)) { + scrollY = mTempRect.bottom - (mView.getHeight()-vi.bottom); if (DEBUG_INPUT_RESIZE) Log.v(mTag, "Bottom covered; scrollY=" + scrollY); + } else { + scrollY = 0; } handled = true; } diff --git a/core/java/android/view/inputmethod/InputMethodManagerInternal.java b/core/java/android/view/inputmethod/InputMethodManagerInternal.java index ce9908cce093..77df4e3883a7 100644 --- a/core/java/android/view/inputmethod/InputMethodManagerInternal.java +++ b/core/java/android/view/inputmethod/InputMethodManagerInternal.java @@ -32,4 +32,9 @@ public interface InputMethodManagerInternal { * Called by the window manager to let the input method manager rotate the input method. */ void switchInputMethod(boolean forwardDirection); + + /** + * Hides the current input method, if visible. + */ + void hideCurrentInputMethod(); } diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index 28ade80a260e..b331be72b4cf 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -2675,19 +2675,49 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te return (mGroupFlags & CLIP_TO_PADDING_MASK) == CLIP_TO_PADDING_MASK ? 0 : mPaddingBottom; } + /** + * @hide + */ @Override - protected void onSizeChanged(int w, int h, int oldw, int oldh) { - if (getChildCount() > 0) { - mDataChanged = true; - rememberSyncState(); + protected void internalSetPadding(int left, int top, int right, int bottom) { + super.internalSetPadding(left, top, right, bottom); + if (isLayoutRequested()) { + handleBoundsChange(); } + } + @Override + protected void onSizeChanged(int w, int h, int oldw, int oldh) { + handleBoundsChange(); if (mFastScroll != null) { mFastScroll.onSizeChanged(w, h, oldw, oldh); } } /** + * Called when bounds of the AbsListView are changed. AbsListView marks data set as changed + * and force layouts all children that don't have exact measure specs. + * <p> + * This invalidation is necessary, otherwise, AbsListView may think the children are valid and + * fail to relayout them properly to accommodate for new bounds. + */ + void handleBoundsChange() { + final int childCount = getChildCount(); + if (childCount > 0) { + mDataChanged = true; + rememberSyncState(); + for (int i = 0; i < childCount; i++) { + final View child = getChildAt(i); + final ViewGroup.LayoutParams lp = child.getLayoutParams(); + // force layout child unless it has exact specs + if (lp == null || lp.width < 1 || lp.height < 1) { + child.forceLayout(); + } + } + } + } + + /** * @return True if the current touch mode requires that we draw the selector in the pressed * state. */ diff --git a/core/java/android/widget/DateTimeView.java b/core/java/android/widget/DateTimeView.java index d2ee86622e08..e172044a87d6 100644 --- a/core/java/android/widget/DateTimeView.java +++ b/core/java/android/widget/DateTimeView.java @@ -34,6 +34,7 @@ import android.icu.util.Calendar; import android.os.Handler; import android.text.format.Time; import android.util.AttributeSet; +import android.view.accessibility.AccessibilityNodeInfo; import android.widget.RemoteViews.RemoteView; import com.android.internal.R; @@ -118,7 +119,6 @@ public class DateTimeView extends TextView { public void setTime(long time) { Time t = new Time(); t.set(time); - t.second = 0; mTimeMillis = t.toMillis(false); mTime = new Date(t.year-1900, t.month, t.monthDay, t.hour, t.minute, 0); update(); @@ -333,6 +333,63 @@ public class DateTimeView extends TextView { update(); } + @Override + public void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) { + super.onInitializeAccessibilityNodeInfoInternal(info); + if (mShowRelativeTime) { + // The short version of the time might not be completely understandable and for + // accessibility we rather have a longer version. + long now = System.currentTimeMillis(); + long duration = Math.abs(now - mTimeMillis); + int count; + boolean past = (now >= mTimeMillis); + String result; + if (duration < MINUTE_IN_MILLIS) { + result = mNowText; + } else if (duration < HOUR_IN_MILLIS) { + count = (int)(duration / MINUTE_IN_MILLIS); + result = String.format(getContext().getResources().getQuantityString(past + ? com.android.internal. + R.plurals.duration_minutes_relative + : com.android.internal. + R.plurals.duration_minutes_relative_future, + count), + count); + } else if (duration < DAY_IN_MILLIS) { + count = (int)(duration / HOUR_IN_MILLIS); + result = String.format(getContext().getResources().getQuantityString(past + ? com.android.internal. + R.plurals.duration_hours_relative + : com.android.internal. + R.plurals.duration_hours_relative_future, + count), + count); + } else if (duration < YEAR_IN_MILLIS) { + // In weird cases it can become 0 because of daylight savings + TimeZone timeZone = TimeZone.getDefault(); + count = Math.max(Math.abs(dayDistance(timeZone, mTimeMillis, now)), 1); + result = String.format(getContext().getResources().getQuantityString(past + ? com.android.internal. + R.plurals.duration_days_relative + : com.android.internal. + R.plurals.duration_days_relative_future, + count), + count); + + } else { + count = (int)(duration / YEAR_IN_MILLIS); + result = String.format(getContext().getResources().getQuantityString(past + ? com.android.internal. + R.plurals.duration_years_relative + : com.android.internal. + R.plurals.duration_years_relative_future, + count), + count); + } + info.setText(result); + } + } + private static class ReceiverInfo { private final ArrayList<DateTimeView> mAttachedViews = new ArrayList<DateTimeView>(); private final BroadcastReceiver mReceiver = new BroadcastReceiver() { diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 3711b9402f3a..5cbd2841b57a 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -6857,11 +6857,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener .setLineSpacing(mSpacingAdd, mSpacingMult) .setIncludePad(mIncludePad) .setBreakStrategy(mBreakStrategy) - .setHyphenationFrequency(mHyphenationFrequency) - .setMaxLines(mMaxMode == LINES ? mMaximum : Integer.MAX_VALUE); + .setHyphenationFrequency(mHyphenationFrequency); if (shouldEllipsize) { builder.setEllipsize(mEllipsize) - .setEllipsizedWidth(ellipsisWidth); + .setEllipsizedWidth(ellipsisWidth) + .setMaxLines(mMaxMode == LINES ? mMaximum : Integer.MAX_VALUE); } mHintLayout = builder.build(); } @@ -6948,12 +6948,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener .setLineSpacing(mSpacingAdd, mSpacingMult) .setIncludePad(mIncludePad) .setBreakStrategy(mBreakStrategy) - .setHyphenationFrequency(mHyphenationFrequency) - .setMaxLines(mMaxMode == LINES ? mMaximum : Integer.MAX_VALUE); + .setHyphenationFrequency(mHyphenationFrequency); if (shouldEllipsize) { builder.setEllipsize(effectiveEllipsize) - .setEllipsizedWidth(ellipsisWidth); - + .setEllipsizedWidth(ellipsisWidth) + .setMaxLines(mMaxMode == LINES ? mMaximum : Integer.MAX_VALUE); } // TODO: explore always setting maxLines result = builder.build(); @@ -6983,19 +6982,14 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener return false; } - private static int desired(Layout layout, int maxLines) { + private static int desired(Layout layout) { int n = layout.getLineCount(); CharSequence text = layout.getText(); float max = 0; - // if maxLines is set, and the text length is greater that the length of the text in the - // layout, it means that there is a cut-off and we cannot use it. - if (maxLines != -1 && text.length() > layout.getLineEnd(n - 1)) { - return -1; - } - // if any line was wrapped, we can't use it. // but it's ok for the last line not to have a newline + for (int i = 0; i < n - 1; i++) { if (text.charAt(layout.getLineEnd(i) - 1) != '\n') return -1; @@ -7068,7 +7062,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener width = widthSize; } else { if (mLayout != null && mEllipsize == null) { - des = desired(mLayout, getMaxLines()); + des = desired(mLayout); } if (des < 0) { @@ -7100,7 +7094,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener int hintWidth; if (mHintLayout != null && mEllipsize == null) { - hintDes = desired(mHintLayout, getMaxLines()); + hintDes = desired(mHintLayout); } if (hintDes < 0) { diff --git a/core/java/com/android/internal/app/LocaleHelper.java b/core/java/com/android/internal/app/LocaleHelper.java index 106999bd592c..d26be9195825 100644 --- a/core/java/com/android/internal/app/LocaleHelper.java +++ b/core/java/com/android/internal/app/LocaleHelper.java @@ -16,9 +16,11 @@ package com.android.internal.app; +import android.annotation.IntRange; import android.icu.text.ListFormatter; import android.icu.util.ULocale; import android.os.LocaleList; +import android.text.TextUtils; import java.text.Collator; import java.util.Comparator; @@ -153,16 +155,34 @@ public class LocaleHelper { * @param locales the list of locales whose names is to be displayed. * @param displayLocale the locale in which to display the names. * If this is null, it will use the default locale. + * @param maxLocales maximum number of locales to display. Generates ellipsis after that. * @return the locale aware list of locale names */ - public static String getDisplayLocaleList(LocaleList locales, Locale displayLocale) { + public static String getDisplayLocaleList( + LocaleList locales, Locale displayLocale, @IntRange(from=1) int maxLocales) { + final Locale dispLocale = displayLocale == null ? Locale.getDefault() : displayLocale; - int localeCount = locales.size(); - final String[] localeNames = new String[localeCount]; + final boolean ellipsisNeeded = locales.size() > maxLocales; + final int localeCount, listCount; + if (ellipsisNeeded) { + localeCount = maxLocales; + listCount = maxLocales + 1; // One extra slot for the ellipsis + } else { + listCount = localeCount = locales.size(); + } + final String[] localeNames = new String[listCount]; for (int i = 0; i < localeCount; i++) { localeNames[i] = LocaleHelper.getDisplayName(locales.get(i), dispLocale, false); } + if (ellipsisNeeded) { + // Theoretically, we want to extract this from ICU's Resource Bundle for + // "Ellipsis/final", which seems to have different strings than the normal ellipsis for + // Hong Kong Traditional Chinese (zh_Hant_HK) and Dzongkha (dz). But that has two + // problems: it's expensive to extract it, and in case the output string becomes + // automatically ellipsized, it can result in weird output. + localeNames[maxLocales] = TextUtils.ELLIPSIS_STRING; + } ListFormatter lfn = ListFormatter.getInstance(dispLocale); return lfn.format((Object[]) localeNames); diff --git a/core/java/com/android/internal/app/PlatLogoActivity.java b/core/java/com/android/internal/app/PlatLogoActivity.java index 59445688aa7e..ef2fd0d7401d 100644 --- a/core/java/com/android/internal/app/PlatLogoActivity.java +++ b/core/java/com/android/internal/app/PlatLogoActivity.java @@ -53,6 +53,8 @@ import android.widget.FrameLayout; import android.widget.ImageView; public class PlatLogoActivity extends Activity { + public static final boolean REVEAL_THE_NAME = true; + FrameLayout mLayout; int mTapCount; int mKeyCount; @@ -100,6 +102,19 @@ public class PlatLogoActivity extends Activity { public boolean onLongClick(View v) { if (mTapCount < 5) return false; + if (REVEAL_THE_NAME) { + final Drawable overlay = getDrawable( + com.android.internal.R.drawable.platlogo_m); + overlay.setBounds(0, 0, v.getMeasuredWidth(), v.getMeasuredHeight()); + im.getOverlay().clear(); + im.getOverlay().add(overlay); + overlay.setAlpha(0); + ObjectAnimator.ofInt(overlay, "alpha", 0, 255) + .setDuration(500) + .start(); + return true; + } + final ContentResolver cr = getContentResolver(); if (Settings.System.getLong(cr, Settings.System.EGG_MODE, 0) == 0) { diff --git a/core/java/com/android/internal/app/WindowDecorActionBar.java b/core/java/com/android/internal/app/WindowDecorActionBar.java index a09dbe553c7c..1376d0ad5cdc 100644 --- a/core/java/com/android/internal/app/WindowDecorActionBar.java +++ b/core/java/com/android/internal/app/WindowDecorActionBar.java @@ -873,24 +873,40 @@ public class WindowDecorActionBar extends ActionBar implements hideForActionMode(); } - Animator fadeIn, fadeOut; - if (toActionMode) { - fadeOut = mDecorToolbar.setupAnimatorToVisibility(View.GONE, - FADE_OUT_DURATION_MS); - fadeIn = mContextView.setupAnimatorToVisibility(View.VISIBLE, - FADE_IN_DURATION_MS); + if (shouldAnimateContextView()) { + Animator fadeIn, fadeOut; + if (toActionMode) { + fadeOut = mDecorToolbar.setupAnimatorToVisibility(View.GONE, + FADE_OUT_DURATION_MS); + fadeIn = mContextView.setupAnimatorToVisibility(View.VISIBLE, + FADE_IN_DURATION_MS); + } else { + fadeIn = mDecorToolbar.setupAnimatorToVisibility(View.VISIBLE, + FADE_IN_DURATION_MS); + fadeOut = mContextView.setupAnimatorToVisibility(View.GONE, + FADE_OUT_DURATION_MS); + } + AnimatorSet set = new AnimatorSet(); + set.playSequentially(fadeOut, fadeIn); + set.start(); } else { - fadeIn = mDecorToolbar.setupAnimatorToVisibility(View.VISIBLE, - FADE_IN_DURATION_MS); - fadeOut = mContextView.setupAnimatorToVisibility(View.GONE, - FADE_OUT_DURATION_MS); - } - AnimatorSet set = new AnimatorSet(); - set.playSequentially(fadeOut, fadeIn); - set.start(); + if (toActionMode) { + mDecorToolbar.setVisibility(View.GONE); + mContextView.setVisibility(View.VISIBLE); + } else { + mDecorToolbar.setVisibility(View.VISIBLE); + mContextView.setVisibility(View.GONE); + } + } // mTabScrollView's visibility is not affected by action mode. } + private boolean shouldAnimateContextView() { + // We only to animate the action mode in if the container view has already been laid out. + // If it hasn't been laid out, it hasn't been drawn to screen yet. + return mContainerView.isLaidOut(); + } + public Context getThemedContext() { if (mThemedContext == null) { TypedValue outValue = new TypedValue(); diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index 93dc625f8846..8b0235249436 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -8153,14 +8153,17 @@ public class BatteryStatsImpl extends BatteryStats { } private void resetAllStatsLocked() { + final long uptimeMillis = mClocks.uptimeMillis(); + final long elapsedRealtimeMillis = mClocks.elapsedRealtime(); mStartCount = 0; - initTimes(mClocks.uptimeMillis() * 1000, mClocks.elapsedRealtime() * 1000); + initTimes(uptimeMillis * 1000, elapsedRealtimeMillis * 1000); mScreenOnTimer.reset(false); for (int i=0; i<NUM_SCREEN_BRIGHTNESS_BINS; i++) { mScreenBrightnessTimer[i].reset(false); } mInteractiveTimer.reset(false); mPowerSaveModeEnabledTimer.reset(false); + mLastIdleTimeStart = elapsedRealtimeMillis; mLongestLightIdleTime = 0; mLongestFullIdleTime = 0; mDeviceIdleModeLightTimer.reset(false); diff --git a/core/java/com/android/internal/os/InstallerConnection.java b/core/java/com/android/internal/os/InstallerConnection.java index a7a3cb59f90d..419c3d85599d 100644 --- a/core/java/com/android/internal/os/InstallerConnection.java +++ b/core/java/com/android/internal/os/InstallerConnection.java @@ -157,9 +157,7 @@ public class InstallerConnection { sharedLibraries); } - public boolean mergeProfiles(int uid, String pkgName) throws InstallerException { - final String[] res = execute("merge_profiles", uid, pkgName); - + private boolean safeParseBooleanResult(String[] res) throws InstallerException { if ((res == null) || (res.length != 2)) { throw new InstallerException("Invalid size result: " + Arrays.toString(res)); } @@ -172,6 +170,19 @@ public class InstallerConnection { return Boolean.parseBoolean(res[1]); } + public boolean mergeProfiles(int uid, String pkgName) throws InstallerException { + final String[] res = execute("merge_profiles", uid, pkgName); + + return safeParseBooleanResult(res); + } + + public boolean dumpProfiles(String gid, String packageName, String codePaths) + throws InstallerException { + final String[] res = execute("dump_profiles", gid, packageName, codePaths); + + return safeParseBooleanResult(res); + } + private boolean connect() { if (mSocket != null) { return true; diff --git a/core/java/com/android/internal/policy/DecorView.java b/core/java/com/android/internal/policy/DecorView.java index f5966362fdb2..7e38d9bc742d 100644 --- a/core/java/com/android/internal/policy/DecorView.java +++ b/core/java/com/android/internal/policy/DecorView.java @@ -32,6 +32,7 @@ import com.android.internal.widget.FloatingToolbar; import java.util.List; import android.animation.Animator; +import android.animation.AnimatorListenerAdapter; import android.animation.ObjectAnimator; import android.app.ActivityManager; import android.content.Context; @@ -45,6 +46,7 @@ import android.graphics.PixelFormat; import android.graphics.Rect; import android.graphics.Region; import android.graphics.Shader; +import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.RemoteException; import android.util.DisplayMetrics; @@ -907,10 +909,12 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind if (getBackground() != drawable) { setBackgroundDrawable(drawable); if (drawable != null) { - mResizingBackgroundDrawable = drawable; + mResizingBackgroundDrawable = enforceNonTranslucentBackground(drawable, + mWindow.isTranslucent() || mWindow.isShowingWallpaper()); } else { mResizingBackgroundDrawable = getResizingBackgroundDrawable( - getContext(), 0, mWindow.mBackgroundFallbackResource); + getContext(), 0, mWindow.mBackgroundFallbackResource, + mWindow.isTranslucent() || mWindow.isShowingWallpaper()); } if (mResizingBackgroundDrawable != null) { mResizingBackgroundDrawable.getPadding(mBackgroundPadding); @@ -1585,31 +1589,27 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind mPrimaryActionModeView.getApplicationWindowToken(), Gravity.TOP | Gravity.FILL_HORIZONTAL, 0, 0); endOnGoingFadeAnimation(); - mFadeAnim = ObjectAnimator.ofFloat(mPrimaryActionModeView, View.ALPHA, - 0f, 1f); - mFadeAnim.addListener(new Animator.AnimatorListener() { - @Override - public void onAnimationStart(Animator animation) { - mPrimaryActionModeView.setVisibility(VISIBLE); - } - - @Override - public void onAnimationEnd(Animator animation) { - mPrimaryActionModeView.setAlpha(1f); - mFadeAnim = null; - } - - @Override - public void onAnimationCancel(Animator animation) { - - } - @Override - public void onAnimationRepeat(Animator animation) { + if (shouldAnimatePrimaryActionModeView()) { + mFadeAnim = ObjectAnimator.ofFloat(mPrimaryActionModeView, View.ALPHA, + 0f, 1f); + mFadeAnim.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationStart(Animator animation) { + mPrimaryActionModeView.setVisibility(VISIBLE); + } - } - }); - mFadeAnim.start(); + @Override + public void onAnimationEnd(Animator animation) { + mPrimaryActionModeView.setAlpha(1f); + mFadeAnim = null; + } + }); + mFadeAnim.start(); + } else { + mPrimaryActionModeView.setAlpha(1f); + mPrimaryActionModeView.setVisibility(VISIBLE); + } } }; } else { @@ -1643,35 +1643,36 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind if (mPrimaryActionModePopup != null) { post(mShowPrimaryActionModePopup); } else { - mFadeAnim = ObjectAnimator.ofFloat(mPrimaryActionModeView, View.ALPHA, 0f, 1f); - mFadeAnim.addListener(new Animator.AnimatorListener() { - @Override - public void onAnimationStart(Animator animation) { - mPrimaryActionModeView.setVisibility(View.VISIBLE); - } - - @Override - public void onAnimationEnd(Animator animation) { - mPrimaryActionModeView.setAlpha(1f); - mFadeAnim = null; - } - - @Override - public void onAnimationCancel(Animator animation) { - - } - - @Override - public void onAnimationRepeat(Animator animation) { + if (shouldAnimatePrimaryActionModeView()) { + mFadeAnim = ObjectAnimator.ofFloat(mPrimaryActionModeView, View.ALPHA, 0f, 1f); + mFadeAnim.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationStart(Animator animation) { + mPrimaryActionModeView.setVisibility(View.VISIBLE); + } - } - }); - mFadeAnim.start(); + @Override + public void onAnimationEnd(Animator animation) { + mPrimaryActionModeView.setAlpha(1f); + mFadeAnim = null; + } + }); + mFadeAnim.start(); + } else { + mPrimaryActionModeView.setAlpha(1f); + mPrimaryActionModeView.setVisibility(View.VISIBLE); + } } mPrimaryActionModeView.sendAccessibilityEvent( AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED); } + boolean shouldAnimatePrimaryActionModeView() { + // We only to animate the action mode in if the decor has already been laid out. + // If it hasn't been laid out, it hasn't been drawn to screen yet. + return isLaidOut(); + } + private ActionMode createFloatingActionMode( View originatingView, ActionMode.Callback2 callback) { if (mFloatingActionMode != null) { @@ -1785,7 +1786,8 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind private void loadBackgroundDrawablesIfNeeded() { if (mResizingBackgroundDrawable == null) { mResizingBackgroundDrawable = getResizingBackgroundDrawable(getContext(), - mWindow.mBackgroundResource, mWindow.mBackgroundFallbackResource); + mWindow.mBackgroundResource, mWindow.mBackgroundFallbackResource, + mWindow.isTranslucent() || mWindow.isShowingWallpaper()); if (mResizingBackgroundDrawable == null) { // We shouldn't really get here as the background fallback should be always // available since it is defaulted by the system. @@ -1893,21 +1895,41 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind * user is resizing the window of an activity in multi-window mode. */ public static Drawable getResizingBackgroundDrawable(Context context, int backgroundRes, - int backgroundFallbackRes) { + int backgroundFallbackRes, boolean windowTranslucent) { if (backgroundRes != 0) { final Drawable drawable = context.getDrawable(backgroundRes); if (drawable != null) { - return drawable; + return enforceNonTranslucentBackground(drawable, windowTranslucent); } } if (backgroundFallbackRes != 0) { final Drawable fallbackDrawable = context.getDrawable(backgroundFallbackRes); if (fallbackDrawable != null) { - return fallbackDrawable; + return enforceNonTranslucentBackground(fallbackDrawable, windowTranslucent); } } - return null; + return new ColorDrawable(Color.BLACK); + } + + /** + * Enforces a drawable to be non-translucent to act as a background if needed, i.e. if the + * window is not translucent. + */ + private static Drawable enforceNonTranslucentBackground(Drawable drawable, + boolean windowTranslucent) { + if (!windowTranslucent && drawable instanceof ColorDrawable) { + ColorDrawable colorDrawable = (ColorDrawable) drawable; + int color = colorDrawable.getColor(); + if (Color.alpha(color) != 255) { + ColorDrawable copy = (ColorDrawable) colorDrawable.getConstantState().newDrawable() + .mutate(); + copy.setColor( + Color.argb(255, Color.red(color), Color.green(color), Color.blue(color))); + return copy; + } + } + return drawable; } /** @@ -2037,7 +2059,7 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind private void drawResizingShadowIfNeeded(DisplayListCanvas canvas) { if (mResizeMode != RESIZE_MODE_DOCKED_DIVIDER || mWindow.mIsFloating || mWindow.isTranslucent() - || (mWindow.getAttributes().flags & FLAG_SHOW_WALLPAPER) != 0) { + || mWindow.isShowingWallpaper()) { return; } canvas.save(); diff --git a/core/java/com/android/internal/policy/PhoneWindow.java b/core/java/com/android/internal/policy/PhoneWindow.java index 4f15ece8e04e..9ad750d3a599 100644 --- a/core/java/com/android/internal/policy/PhoneWindow.java +++ b/core/java/com/android/internal/policy/PhoneWindow.java @@ -509,6 +509,13 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { } /** + * @return Whether the window is currently showing the wallpaper. + */ + boolean isShowingWallpaper() { + return (getAttributes().flags & FLAG_SHOW_WALLPAPER) != 0; + } + + /** * Return a LayoutInflater instance that can be used to inflate XML view layout * resources for use in this Window. * diff --git a/core/java/com/android/internal/util/FastPrintWriter.java b/core/java/com/android/internal/util/FastPrintWriter.java index c74fea05b6d6..e46e6b026fd9 100644 --- a/core/java/com/android/internal/util/FastPrintWriter.java +++ b/core/java/com/android/internal/util/FastPrintWriter.java @@ -1,5 +1,6 @@ package com.android.internal.util; +import android.util.Log; import android.util.Printer; import java.io.IOException; @@ -328,11 +329,13 @@ public class FastPrintWriter extends PrintWriter { } private void flushBytesLocked() throws IOException { - int position; - if ((position = mBytes.position()) > 0) { - mBytes.flip(); - mOutputStream.write(mBytes.array(), 0, position); - mBytes.clear(); + if (!mIoError) { + int position; + if ((position = mBytes.position()) > 0) { + mBytes.flip(); + mOutputStream.write(mBytes.array(), 0, position); + mBytes.clear(); + } } } @@ -352,11 +355,15 @@ public class FastPrintWriter extends PrintWriter { } break; } - flushBytesLocked(); - mOutputStream.flush(); + if (!mIoError) { + flushBytesLocked(); + mOutputStream.flush(); + } } else if (mWriter != null) { - mWriter.write(mText, 0, mPos); - mWriter.flush(); + if (!mIoError) { + mWriter.write(mText, 0, mPos); + mWriter.flush(); + } } else { int nonEolOff = 0; final int sepLen = mSeparator.length(); @@ -385,12 +392,15 @@ public class FastPrintWriter extends PrintWriter { synchronized (lock) { try { flushLocked(); - if (mOutputStream != null) { - mOutputStream.flush(); - } else if (mWriter != null) { - mWriter.flush(); + if (!mIoError) { + if (mOutputStream != null) { + mOutputStream.flush(); + } else if (mWriter != null) { + mWriter.flush(); + } } } catch (IOException e) { + Log.w("FastPrintWriter", "Write failure", e); setError(); } } @@ -407,6 +417,7 @@ public class FastPrintWriter extends PrintWriter { mWriter.close(); } } catch (IOException e) { + Log.w("FastPrintWriter", "Write failure", e); setError(); } } @@ -425,6 +436,8 @@ public class FastPrintWriter extends PrintWriter { try { appendLocked(charArray, 0, charArray.length); } catch (IOException e) { + Log.w("FastPrintWriter", "Write failure", e); + setError(); } } } @@ -442,6 +455,8 @@ public class FastPrintWriter extends PrintWriter { try { appendLocked(ch); } catch (IOException e) { + Log.w("FastPrintWriter", "Write failure", e); + setError(); } } } @@ -465,6 +480,7 @@ public class FastPrintWriter extends PrintWriter { try { appendLocked(str, 0, str.length()); } catch (IOException e) { + Log.w("FastPrintWriter", "Write failure", e); setError(); } } @@ -500,6 +516,7 @@ public class FastPrintWriter extends PrintWriter { flushLocked(); } } catch (IOException e) { + Log.w("FastPrintWriter", "Write failure", e); setError(); } } @@ -564,6 +581,8 @@ public class FastPrintWriter extends PrintWriter { try { appendLocked(buf, offset, count); } catch (IOException e) { + Log.w("FastPrintWriter", "Write failure", e); + setError(); } } } @@ -584,6 +603,8 @@ public class FastPrintWriter extends PrintWriter { try { appendLocked((char) oneChar); } catch (IOException e) { + Log.w("FastPrintWriter", "Write failure", e); + setError(); } } } @@ -600,6 +621,8 @@ public class FastPrintWriter extends PrintWriter { try { appendLocked(str, 0, str.length()); } catch (IOException e) { + Log.w("FastPrintWriter", "Write failure", e); + setError(); } } } @@ -624,6 +647,8 @@ public class FastPrintWriter extends PrintWriter { try { appendLocked(str, offset, count); } catch (IOException e) { + Log.w("FastPrintWriter", "Write failure", e); + setError(); } } } diff --git a/core/jni/android_graphics_drawable_VectorDrawable.cpp b/core/jni/android_graphics_drawable_VectorDrawable.cpp index 9e69f79e4ffc..045f127e830e 100644 --- a/core/jni/android_graphics_drawable_VectorDrawable.cpp +++ b/core/jni/android_graphics_drawable_VectorDrawable.cpp @@ -36,6 +36,13 @@ static jlong createTree(JNIEnv*, jobject, jlong groupPtr) { return reinterpret_cast<jlong>(tree); } +static jlong createTreeFromCopy(JNIEnv*, jobject, jlong treePtr, jlong groupPtr) { + VectorDrawable::Group* rootGroup = reinterpret_cast<VectorDrawable::Group*>(groupPtr); + VectorDrawable::Tree* treeToCopy = reinterpret_cast<VectorDrawable::Tree*>(treePtr); + VectorDrawable::Tree* tree = new VectorDrawable::Tree(treeToCopy, rootGroup); + return reinterpret_cast<jlong>(tree); +} + static jlong createEmptyFullPath(JNIEnv*, jobject) { VectorDrawable::FullPath* newPath = new VectorDrawable::FullPath(); return reinterpret_cast<jlong>(newPath); @@ -344,6 +351,7 @@ static void setTrimPathOffset(JNIEnv*, jobject, jlong fullPathPtr, jfloat trimPa static const JNINativeMethod gMethods[] = { {"nCreateTree", "!(J)J", (void*)createTree}, + {"nCreateTreeFromCopy", "!(JJ)J", (void*)createTreeFromCopy}, {"nSetRendererViewportSize", "!(JFF)V", (void*)setTreeViewportSize}, {"nSetRootAlpha", "!(JF)Z", (void*)setRootAlpha}, {"nGetRootAlpha", "!(J)F", (void*)getRootAlpha}, diff --git a/core/res/res/drawable-nodpi/default_wallpaper.png b/core/res/res/drawable-nodpi/default_wallpaper.png Binary files differindex 91ad252507e5..ce546f0a11e7 100644 --- a/core/res/res/drawable-nodpi/default_wallpaper.png +++ b/core/res/res/drawable-nodpi/default_wallpaper.png diff --git a/core/res/res/drawable-nodpi/platlogo_m.xml b/core/res/res/drawable-nodpi/platlogo_m.xml index f19e045a65ff..d9a558db859a 100644 --- a/core/res/res/drawable-nodpi/platlogo_m.xml +++ b/core/res/res/drawable-nodpi/platlogo_m.xml @@ -1,5 +1,5 @@ <!-- -Copyright (C) 2015 The Android Open Source Project +Copyright (C) 2016 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,19 +19,54 @@ Copyright (C) 2015 The Android Open Source Project android:viewportWidth="48.0" android:viewportHeight="48.0"> <path - android:fillColor="#08000000" - android:pathData="M13.5,34.5l13.3,13.3c11,-1.3,19.7,-10,21,-21L34.5,13.5L13.5,34.5z" - /> + android:fillColor="#FFFFFFFF" + android:pathData="M33.8,38l-25.5,-25.5l-1.7000003,0.6999998l25.499998,25.5z"/> <path - android:pathData="M24,24c0,0,0,2.4,0,5.2s0,5.2,0,5.2L34.5,24V13.5L24,24z" - android:fillColor="#FFFFFF"/> + android:fillColor="#FFFFFFFF" + android:pathData="M40.8,34.8l-25.4,-25.5l-1.6999998,0.6999998l25.5,25.5z"/> <path - android:pathData="M24,24L13.5,13.5V24L24,34.5c0,0,0,-2.4,0,-5.2S24,24,24,24z" - android:fillColor="#EEEEEE"/> + android:fillColor="#FFFFFFFF" + android:pathData="M11.1,13.1l-0.3,-0.4l1.1,-1.3l0,0l-1.6,0.8l-0.4,-0.4l2.6,-1.2l0.4,0.4l-1.1,1.3l0,0l1.6,-0.8l0.3,0.4L11.1,13.1z"/> <path - android:pathData="M13.5,34.5l10.5,0.0l-10.5,-10.5z" - android:fillColor="#DDDDDD"/> + android:fillColor="#FFFFFFFF" + android:pathData="M13,14.2l-0.5,-0.5l-0.6,0.2l-0.4,-0.4l3.1,-0.7l0.4,0.4l-2.1,1.7l-0.4,-0.4L13,14.2z M13,13.6l0.3,0.3l0.8,-0.6 l0,0L13,13.6z"/> <path - android:pathData="M34.5,34.5l0.0,-10.5l-10.5,10.5z" - android:fillColor="#DDDDDD"/> + android:fillColor="#FFFFFFFF" + android:pathData="M16.3,14.6l-1.6,1.2l0,0l2.2,-0.6l0.5,0.5l-2.6,1.2l-0.3,-0.4l0.7,-0.3l1,-0.4l0,0l-2.1,0.5L13.9,16l1.4,-1.1l0,0 l-0.9,0.5l-0.7,0.3l-0.3,-0.4l2.6,-1.2L16.3,14.6z"/> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M17.4,17.8l-0.6,-0.6l-0.7,0.3l0.7,0.7l-0.4,0.2l-1,-1l2.6,-1.2l1,1l-0.4,0.2l-0.7,-0.7L17.2,17l0.6,0.6L17.4,17.8 z"/> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M18.8,18.7L18.8,18.7l1.3,-0.2l0.4,0.4l-2.1,0.3l-0.9,0.4l-0.3,-0.4l1,-0.4l1.2,-1.2l0.4,0.4L18.8,18.7z"/> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M22.2,20.5l-1.6,1.2l0,0l2.2,-0.6l0.5,0.5l-2.6,1.2l-0.3,-0.4l0.7,-0.3l1,-0.4l0,0L20,22.1l-0.2,-0.2l1.4,-1.1l0,0 l-0.9,0.5l-0.7,0.3l-0.3,-0.4l2.6,-1.2L22.2,20.5z"/> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M22,23.6c0,0,0.1,0.1,0.2,0.1c0.1,0,0.2,0,0.3,-0.1l0.3,0.3c-0.2,0.1,-0.4,0.1,-0.6,0.1c-0.2,0,-0.4,-0.1,-0.5,-0.2 c-0.2,-0.2,-0.2,-0.3,-0.1,-0.5c0.1,-0.2,0.2,-0.3,0.5,-0.4l0.2,-0.1c0.3,-0.1,0.5,-0.2,0.8,-0.2c0.2,0,0.5,0.1,0.6,0.3 c0.1,0.1,0.2,0.3,0.1,0.4c0,0.1,-0.2,0.3,-0.4,0.4L23,23.4c0.1,0,0.2,-0.1,0.2,-0.2c0,-0.1,0,-0.1,0,-0.2C23.1,23,23,22.9,22.9,23 c-0.1,0,-0.2,0.1,-0.4,0.1l-0.2,0.1c-0.2,0.1,-0.3,0.1,-0.3,0.2C21.9,23.5,21.9,23.5,22,23.6z"/> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M23.8,25.9l-0.3,-0.4l1.1,-1.3l0,0L22.9,25l-0.4,-0.4l2.6,-1.2l0.4,0.4l-1.1,1.3l0,0l1.6,-0.8l0.3,0.4L23.8,25.9z"/> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M25.7,27l-0.5,-0.5l-0.6,0.2l-0.4,-0.4l3.1,-0.7l0.4,0.4l-2.1,1.7l-0.4,-0.4L25.7,27z M25.7,26.4l0.3,0.3l0.8,-0.6 l0,0L25.7,26.4z"/> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M29,27.4l-1.6,1.2l0,0l2.2,-0.6l0.5,0.5l-2.6,1.2l-0.3,-0.4l0.8,-0.3l1,-0.4l0,0L26.8,29l-0.2,-0.2l1.4,-1.1l0,0 L27,28.1l-0.8,0.3l-0.3,-0.4l2.6,-1.2L29,27.4z"/> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M30,30.6L29.5,30l-0.7,0.3l0.7,0.7L29,31.2l-1,-1l2.6,-1.2l1,1l-0.4,0.2l-0.7,-0.7l-0.6,0.3l0.6,0.6L30,30.6z"/> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M31.5,32.1l-0.6,-0.6L29.8,32l-0.4,-0.4l2.6,-1.2l1,1l-0.4,0.2L32,31l-0.7,0.3l0.6,0.6L31.5,32.1z"/> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M32,33.5L31.6,33L31,33.2l-0.4,-0.4l3.1,-0.7l0.4,0.4l-2.1,1.7l-0.4,-0.4L32,33.5z M32.1,32.9l0.3,0.3l0.8,-0.6 l0,0L32.1,32.9z"/> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M34.3,35.3c-0.3,0.1,-0.5,0.2,-0.8,0.1c-0.2,0,-0.5,-0.1,-0.6,-0.3c-0.2,-0.2,-0.2,-0.4,-0.2,-0.5 c0.1,-0.2,0.2,-0.3,0.6,-0.5l0.8,-0.4c0.3,-0.1,0.6,-0.2,0.9,-0.2c0.3,0,0.5,0.1,0.7,0.3c0.2,0.2,0.3,0.4,0.2,0.5c0,0.2,-0.2,0.3,-0.5,0.5 l-0.3,-0.4c0.2,-0.1,0.3,-0.1,0.3,-0.2c0,-0.1,0,-0.1,-0.1,-0.2C35,34,34.9,34,34.8,34c-0.1,0,-0.3,0,-0.5,0.1l-0.8,0.4 c-0.2,0.1,-0.3,0.2,-0.4,0.2c0,0.1,0,0.1,0,0.2c0.1,0.1,0.2,0.1,0.3,0.1c0.1,0,0.2,0,0.4,-0.1L34.3,35.3z"/> + <path + android:fillColor="#FFFFFFFF" + android:pathData="M36,36.6L35.4,36l-0.7,0.3l0.7,0.7l-0.4,0.2l-1,-1l2.6,-1.2l1,1l-0.4,0.2l-0.7,-0.7l-0.6,0.3l0.6,0.6L36,36.6z"/> </vector> diff --git a/core/res/res/layout/app_error_dialog.xml b/core/res/res/layout/app_error_dialog.xml index 7147ea24ee5d..d78ce59872ff 100644 --- a/core/res/res/layout/app_error_dialog.xml +++ b/core/res/res/layout/app_error_dialog.xml @@ -35,11 +35,11 @@ /> <Button - android:id="@+id/aerr_reset" + android:id="@+id/aerr_close" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/aerr_reset" - android:drawableStart="@drawable/ic_refresh" + android:text="@string/aerr_close_app" + android:drawableStart="@drawable/ic_close" style="@style/aerr_list_item" /> @@ -53,15 +53,6 @@ /> <Button - android:id="@+id/aerr_close" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/aerr_close" - android:drawableStart="@drawable/ic_close" - style="@style/aerr_list_item" - /> - - <Button android:id="@+id/aerr_mute" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/core/res/res/layout/notification_template_header.xml b/core/res/res/layout/notification_template_header.xml index d16dcc6b906c..38ea92a73a5a 100644 --- a/core/res/res/layout/notification_template_header.xml +++ b/core/res/res/layout/notification_template_header.xml @@ -96,6 +96,7 @@ android:layout_height="wrap_content" android:paddingTop="1dp" android:visibility="gone" + android:contentDescription="@string/expand_button_content_description" /> <ImageView android:id="@+id/profile_badge" android:layout_width="@dimen/notification_badge_size" diff --git a/core/res/res/layout/preference_material.xml b/core/res/res/layout/preference_material.xml index bf0fda94838e..871b99ca6679 100644 --- a/core/res/res/layout/preference_material.xml +++ b/core/res/res/layout/preference_material.xml @@ -67,7 +67,8 @@ android:layout_alignStart="@id/title" android:textAppearance="?attr/textAppearanceListItemSecondary" android:textColor="?attr/textColorSecondary" - android:maxLines="10" /> + android:maxLines="10" + android:ellipsize="end" /> </RelativeLayout> diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index 44923c9890dc..86f55958d28a 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -522,11 +522,11 @@ <string name="policydesc_watchLogin_secondaryUser" product="tablet" msgid="4280246270601044505">"Monitor die aantal verkeerde wagwoorde wat ingevoer word wanneer die skerm ontsluit word, en sluit die tablet of vee al hierdie gebruiker se data uit as te veel verkeerde wagwoorde ingevoer word."</string> <string name="policydesc_watchLogin_secondaryUser" product="TV" msgid="3484832653564483250">"Monitor die aantal verkeerde wagwoorde wat ingevoer word wanneer die skerm ontsluit word, en sluit die TV of vee al hierdie gebruiker se data uit as te veel verkeerde wagwoorde ingevoer word."</string> <string name="policydesc_watchLogin_secondaryUser" product="default" msgid="2185480427217127147">"Monitor die aantal verkeerde wagwoorde wat ingevoer word wanneer die skerm ontsluit word, en sluit die foon of vee al hierdie gebruiker se data uit as te veel verkeerde wagwoorde ingevoer word."</string> - <string name="policylab_resetPassword" msgid="4934707632423915395">"Verander die skermslot"</string> + <string name="policylab_resetPassword" msgid="4934707632423915395">"Om die skermslot te verander"</string> <string name="policydesc_resetPassword" msgid="1278323891710619128">"Verander die skermslot."</string> - <string name="policylab_forceLock" msgid="2274085384704248431">"Sluit die skerm"</string> + <string name="policylab_forceLock" msgid="2274085384704248431">"Om die skerm te sluit"</string> <string name="policydesc_forceLock" msgid="1141797588403827138">"Beheer hoe en wanneer die skerm sluit."</string> - <string name="policylab_wipeData" msgid="3910545446758639713">"Vee alle data uit"</string> + <string name="policylab_wipeData" msgid="3910545446758639713">"Om alle data uit te vee"</string> <string name="policydesc_wipeData" product="tablet" msgid="4306184096067756876">"Vee die tablet se data uit sonder waarskuwing, deur \'n fabrieksterugstelling uit te voer."</string> <string name="policydesc_wipeData" product="tv" msgid="5816221315214527028">"Vee die TV se data sonder waarskuwing uit deur \'n fabriekterugstelling te doen."</string> <string name="policydesc_wipeData" product="default" msgid="5096895604574188391">"Vee die foon se data uit sonder waarskuwing, deur \'n fabrieksterugstelling uit te voer."</string> @@ -891,6 +891,38 @@ <item quantity="other">oor <xliff:g id="COUNT_1">%d</xliff:g> j.</item> <item quantity="one">oor <xliff:g id="COUNT_0">%d</xliff:g> j.</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minute gelede</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minuut gelede</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> uur gelede</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> uur gelede</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> dae gelede</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> dag gelede</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> jaar gelede</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> jaar gelede</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other">oor <xliff:g id="COUNT_1">%d</xliff:g> minute</item> + <item quantity="one">oor <xliff:g id="COUNT_0">%d</xliff:g> minuut</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other">oor <xliff:g id="COUNT_1">%d</xliff:g> uur</item> + <item quantity="one">oor <xliff:g id="COUNT_0">%d</xliff:g> uur</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other">oor <xliff:g id="COUNT_1">%d</xliff:g> dae</item> + <item quantity="one">oor <xliff:g id="COUNT_0">%d</xliff:g> dag</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other">oor <xliff:g id="COUNT_1">%d</xliff:g> jaar</item> + <item quantity="one">oor <xliff:g id="COUNT_0">%d</xliff:g> jaar</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Videoprobleem"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Hierdie video is nie geldig vir stroming na hierdie toestel nie."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Kan nie hierdie video speel nie."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> het gestop"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> stop aanhoudend"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> stop aanhoudend"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Herbegin program"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Stel terug en herbegin program"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Maak program weer oop"</string> <string name="aerr_report" msgid="5371800241488400617">"Stuur terugvoer"</string> <string name="aerr_close" msgid="2991640326563991340">"Maak toe"</string> <string name="aerr_mute" msgid="1974781923723235953">"Demp totdat toestel herbegin"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> uitgevee"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"Werk-<xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Raak en hou Terug om hierdie skerm te ontspeld."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Raak en hou Oorsig om hierdie skerm te ontspeld."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Program is vasgespeld: Dit mag nie op hierdie toestel ontspeld word nie."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Skerm vasgespeld"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Skerm ontspeld"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS-versoek is gewysig tot USSD-versoek."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS-versoek is gewysig tot nuwe SS-versoek."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Werkprofiel"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Uitvou-knoppie"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"wissel uitvou-aksie"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android-USB-randpoort"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB-randpoort"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Maak oorloop toe"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Maksimeer"</string> <string name="close_button_text" msgid="3937902162644062866">"Maak toe"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> gekies</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> gekies</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Doen \'n fabriekterugstelling om hierdie toestel sonder beperkinge te gebruik"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Raak om meer te wete te kom."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Het <xliff:g id="LABEL">%1$s</xliff:g> gedeaktiveer"</string> </resources> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index a648c006141a..678c7cd2007d 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -891,6 +891,38 @@ <item quantity="one">በ<xliff:g id="COUNT_1">%d</xliff:g> ዓ ውስጥ</item> <item quantity="other">በ<xliff:g id="COUNT_1">%d</xliff:g> ዓ ውስጥ</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="one">ከ<xliff:g id="COUNT_1">%d</xliff:g> ደቂቃዎች በፊት</item> + <item quantity="other">ከ<xliff:g id="COUNT_1">%d</xliff:g> ደቂቃዎች በፊት</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="one">ከ<xliff:g id="COUNT_1">%d</xliff:g> ሰዓቶች በፊት</item> + <item quantity="other">ከ<xliff:g id="COUNT_1">%d</xliff:g> ሰዓቶች በፊት</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="one">ከ<xliff:g id="COUNT_1">%d</xliff:g> ቀኖች በፊት</item> + <item quantity="other">ከ<xliff:g id="COUNT_1">%d</xliff:g> ቀኖች በፊት</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="one">ከ<xliff:g id="COUNT_1">%d</xliff:g> ዓመቶች በፊት</item> + <item quantity="other">ከ<xliff:g id="COUNT_1">%d</xliff:g> ዓመቶች በፊት</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="one">በ<xliff:g id="COUNT_1">%d</xliff:g> ደቂቃዎች ውስጥ</item> + <item quantity="other">በ<xliff:g id="COUNT_1">%d</xliff:g> ደቂቃዎች ውስጥ</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="one">በ<xliff:g id="COUNT_1">%d</xliff:g> ሰዓቶች ውስጥ</item> + <item quantity="other">በ<xliff:g id="COUNT_1">%d</xliff:g> ሰዓቶች ውስጥ</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="one">በ<xliff:g id="COUNT_1">%d</xliff:g> ቀኖች ውስጥ</item> + <item quantity="other">በ<xliff:g id="COUNT_1">%d</xliff:g> ቀኖች ውስጥ</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="one">በ<xliff:g id="COUNT_1">%d</xliff:g> ዓመቶች ውስጥ</item> + <item quantity="other">በ<xliff:g id="COUNT_1">%d</xliff:g> ዓመቶች ውስጥ</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"የቪዲዮ ችግር"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"ይቅርታ፣ ይህ ቪዲዮ በዚህ መሣሪያ ለመልቀቅ ትክክል አይደለም።"</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"ይሄን ቪዲዮ ማጫወት አልተቻለም።"</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> ቆሟል"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> አሁንም እያቆመ ነው"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> አሁንም እያቆመ ነው"</string> - <string name="aerr_restart" msgid="9001379185665886595">"መተግበሪያውን ዳግም አስጀምር"</string> - <string name="aerr_reset" msgid="7645427603514220451">"ዳግም ያቀናብሩ እና መተግበሪያ ዳግም ያስጀምሩት"</string> + <string name="aerr_restart" msgid="7581308074153624475">"መተግበሪያውን እንደገና ክፈት"</string> <string name="aerr_report" msgid="5371800241488400617">"ግብረመልስ ይላኩ"</string> <string name="aerr_close" msgid="2991640326563991340">"ዝጋ"</string> <string name="aerr_mute" msgid="1974781923723235953">"መሣሪያ ዳግም እስኪጀመር ድረስ ድምጽ ያጥፉ"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> ተሰርዟል"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"ስራ <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"ይህን ማያ ገጽ ለመንቀል ተመለስን ይንኩትና ያዙት።"</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"ይህን ማያ ገጽ ለመንቀል አጠቃላይ እይታን ይንኩትና ይያዙት።"</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"መተግበሪያ ተሰክቷል፦ በዚህ መሣሪያ ላይ ማላቀቅ አይፈቀድም።"</string> <string name="lock_to_app_start" msgid="6643342070839862795">"ማያ ገጽ ተሰክቷል"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"ማያ ገጽ ተነቅሏል"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS ጥያቄ ወደ USSD ጥያቄ ተሻሽሎዋል።"</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS ጥያቄ ወደ አዲስ SS ጥያቄ ተሻሽሎዋል።"</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"የስራ መገለጫ"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"የዘርጋ አዝራር"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"ዝርጋታን ቀያይር"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"የAndroid USB Peripheral ወደብ"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB Peripheral ወደብ"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"ትርፍ ፍሰትን ዝጋ"</string> <string name="maximize_button_text" msgid="7543285286182446254">"አስፋ"</string> <string name="close_button_text" msgid="3937902162644062866">"ዝጋ"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ተመርጧል</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ተመርጠዋል</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"ይህን መሣሪያ ያለምንም ገደብ ለመጠቀም የፋብሪካ ዳግም ያስጀምሩ"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"የበለጠ ለመረዳት ይንኩ።"</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> ተሰናክሏል"</string> </resources> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index 69b5badc25be..4491a757312f 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -951,6 +951,70 @@ <item quantity="other">في <xliff:g id="COUNT_1">%d</xliff:g> عام</item> <item quantity="one">في <xliff:g id="COUNT_0">%d</xliff:g> عام</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="zero">قبل <xliff:g id="COUNT_1">%d</xliff:g> دقيقة</item> + <item quantity="two">قبل دقيقتين (<xliff:g id="COUNT_1">%d</xliff:g>)</item> + <item quantity="few">قبل <xliff:g id="COUNT_1">%d</xliff:g> دقائق</item> + <item quantity="many">قبل <xliff:g id="COUNT_1">%d</xliff:g> دقيقة</item> + <item quantity="other">قبل <xliff:g id="COUNT_1">%d</xliff:g> دقيقة</item> + <item quantity="one">قبل <xliff:g id="COUNT_0">%d</xliff:g> دقيقة</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="zero">قبل <xliff:g id="COUNT_1">%d</xliff:g> ساعة</item> + <item quantity="two">قبل ساعتين (<xliff:g id="COUNT_1">%d</xliff:g>)</item> + <item quantity="few">قبل <xliff:g id="COUNT_1">%d</xliff:g> ساعات</item> + <item quantity="many">قبل <xliff:g id="COUNT_1">%d</xliff:g> ساعة</item> + <item quantity="other">قبل <xliff:g id="COUNT_1">%d</xliff:g> ساعة</item> + <item quantity="one">قبل <xliff:g id="COUNT_0">%d</xliff:g> ساعة</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="zero">قبل <xliff:g id="COUNT_1">%d</xliff:g> يوم</item> + <item quantity="two">قبل يومين (<xliff:g id="COUNT_1">%d</xliff:g>)</item> + <item quantity="few">قبل <xliff:g id="COUNT_1">%d</xliff:g> أيام</item> + <item quantity="many">قبل <xliff:g id="COUNT_1">%d</xliff:g> يومًا</item> + <item quantity="other">قبل <xliff:g id="COUNT_1">%d</xliff:g> يوم</item> + <item quantity="one">قبل <xliff:g id="COUNT_0">%d</xliff:g> يوم</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="zero">قبل <xliff:g id="COUNT_1">%d</xliff:g> سنة</item> + <item quantity="two">قبل سنتين (<xliff:g id="COUNT_1">%d</xliff:g>)</item> + <item quantity="few">قبل <xliff:g id="COUNT_1">%d</xliff:g> سنوات</item> + <item quantity="many">قبل <xliff:g id="COUNT_1">%d</xliff:g> سنة</item> + <item quantity="other">قبل <xliff:g id="COUNT_1">%d</xliff:g> سنة</item> + <item quantity="one">قبل <xliff:g id="COUNT_0">%d</xliff:g> سنة</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="zero">خلال <xliff:g id="COUNT_1">%d</xliff:g> دقيقة</item> + <item quantity="two">خلال دقيقتين (<xliff:g id="COUNT_1">%d</xliff:g>)</item> + <item quantity="few">خلال <xliff:g id="COUNT_1">%d</xliff:g> دقائق</item> + <item quantity="many">خلال <xliff:g id="COUNT_1">%d</xliff:g> دقيقة</item> + <item quantity="other">خلال <xliff:g id="COUNT_1">%d</xliff:g> دقيقة</item> + <item quantity="one">خلال <xliff:g id="COUNT_0">%d</xliff:g> دقيقة</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="zero">خلال <xliff:g id="COUNT_1">%d</xliff:g> ساعة</item> + <item quantity="two">خلال ساعتين (<xliff:g id="COUNT_1">%d</xliff:g>)</item> + <item quantity="few">خلال <xliff:g id="COUNT_1">%d</xliff:g> ساعات</item> + <item quantity="many">خلال <xliff:g id="COUNT_1">%d</xliff:g> ساعة</item> + <item quantity="other">خلال <xliff:g id="COUNT_1">%d</xliff:g> ساعة</item> + <item quantity="one">خلال <xliff:g id="COUNT_0">%d</xliff:g> ساعة</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="zero">خلال <xliff:g id="COUNT_1">%d</xliff:g> يوم</item> + <item quantity="two">خلال يومين (<xliff:g id="COUNT_1">%d</xliff:g>)</item> + <item quantity="few">خلال <xliff:g id="COUNT_1">%d</xliff:g> أيام</item> + <item quantity="many">خلال <xliff:g id="COUNT_1">%d</xliff:g> يومًا</item> + <item quantity="other">خلال <xliff:g id="COUNT_1">%d</xliff:g> يوم</item> + <item quantity="one">خلال <xliff:g id="COUNT_0">%d</xliff:g> يوم</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="zero">خلال <xliff:g id="COUNT_1">%d</xliff:g> سنة</item> + <item quantity="two">خلال سنتين (<xliff:g id="COUNT_1">%d</xliff:g>)</item> + <item quantity="few">خلال <xliff:g id="COUNT_1">%d</xliff:g> سنوات</item> + <item quantity="many">خلال <xliff:g id="COUNT_1">%d</xliff:g> سنة</item> + <item quantity="other">خلال <xliff:g id="COUNT_1">%d</xliff:g> سنة</item> + <item quantity="one">خلال <xliff:g id="COUNT_0">%d</xliff:g> سنة</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"مشكلة في الفيديو"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"عذرًا، هذا الفيديو غير صالح للبث على هذا الجهاز."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"لا يمكنك تشغيل هذا الفيديو."</string> @@ -1022,8 +1086,7 @@ <string name="aerr_process" msgid="6201597323218674729">"توقفت <xliff:g id="PROCESS">%1$s</xliff:g>"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"يستمر التطبيق <xliff:g id="APPLICATION">%1$s</xliff:g> في التوقف."</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"تستمر عملية <xliff:g id="PROCESS">%1$s</xliff:g> في التوقف."</string> - <string name="aerr_restart" msgid="9001379185665886595">"إعادة تشغيل التطبيق"</string> - <string name="aerr_reset" msgid="7645427603514220451">"إعادة ضبط التطبيق وإعادة تشغيله"</string> + <string name="aerr_restart" msgid="7581308074153624475">"فتح التطبيق مرة أخرى"</string> <string name="aerr_report" msgid="5371800241488400617">"إرسال تعليقات"</string> <string name="aerr_close" msgid="2991640326563991340">"إغلاق"</string> <string name="aerr_mute" msgid="1974781923723235953">"التعطيل حتى إعادة تشغيل الجهاز"</string> @@ -1588,7 +1651,6 @@ <string name="deleted_key" msgid="7659477886625566590">"تم حذف <xliff:g id="KEY">%1$s</xliff:g>"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> المخصص للعمل"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"لإزالة تثبيت هذه الشاشة، يمكنك لمس زر الرجوع مع الاستمرار."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"لإزالة تثبيت هذه الشاشة، يمكنك لمس زر \"نظرة عامة\" مع الاستمرار."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"التطبيق مقيد: ولا يسمح بإلغاء التقييد على هذا الجهاز."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"تم تثبيت الشاشة"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"تم إلغاء تثبيت الشاشة"</string> @@ -1687,6 +1749,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"يتم تعديل طلب SS إلى طلب USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"يتم تعديل طلب SS إلى طلب SS الجديد."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"الملف الشخصي للعمل"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"زر \"توسيع\""</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"تبديل التوسيع"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"منفذ الأجهزة الطرفية المزودة بكابل USB ونظام التشغيل Android"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"منفذ الأجهزة الطرفية المزودة بكابل USB"</string> @@ -1694,6 +1758,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"إغلاق التجاوز"</string> <string name="maximize_button_text" msgid="7543285286182446254">"تكبير"</string> <string name="close_button_text" msgid="3937902162644062866">"إغلاق"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="zero">تم تحديد <xliff:g id="COUNT_1">%1$d</xliff:g> من العناصر</item> <item quantity="two">تم تحديد عنصرين (<xliff:g id="COUNT_1">%1$d</xliff:g>)</item> @@ -1730,4 +1796,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"يمكنك إعادة تعيين بيانات المصنع لاستخدام هذا الجهاز بدون قيود"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"المس للتعرف على مزيد من المعلومات."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"تم تعطيل <xliff:g id="LABEL">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-az-rAZ/strings.xml b/core/res/res/values-az-rAZ/strings.xml index 3619b9ad56a2..d2196fdee927 100644 --- a/core/res/res/values-az-rAZ/strings.xml +++ b/core/res/res/values-az-rAZ/strings.xml @@ -891,6 +891,38 @@ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>ildə</item> <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>ildə</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> dəqiqə əvvəl</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> dəqiqə əvvəl</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> saat əvvəl</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> saat əvvəl</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> gün əvvəl</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> gün əvvəl</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> il əvvəl</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> il əvvəl</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> dəqiqəyə</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> dəqiqəyə</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> saata</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> saata</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> günə</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> günə</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ilə</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ilə</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Video problemi"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Bu video bu cihaza strim olunmaq üçün uyğun deyil."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Bu video oxumur"</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> dayandı"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> dayandırılması davam edir"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> dayandırılması davam edir"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Tətbiqi yenidən başladın"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Tətbiqi sıfırlayın və yenidən başladın"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Tətbiqi yenidən açın"</string> <string name="aerr_report" msgid="5371800241488400617">"Geri əlaqə göndərin"</string> <string name="aerr_close" msgid="2991640326563991340">"Bağla"</string> <string name="aerr_mute" msgid="1974781923723235953">"Cihaz yeniden başladılana kimi səssiz edin"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> silindi"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"İş <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Sancağı götürmək üçün Geri düyməsinə toxunun və saxlayın."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Sancağı götürmək üçün İcmala toxunun və saxlayın."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Tətbiq sancılıb: Açmağa bu cihazda icazə verilmir."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Screen pinned"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Screen unpinned"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS sorğusu USSD sorğusuna dəyişdirildi."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS sorğusu yeni SS sorğusuna dəyişdirildi."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"İş profili"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Genişlik düyməsi"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"keçid genişlənməsi"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB Peripheral Port"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB Peripheral Port"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Yüklənməni qapadın"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Böyüdün"</string> <string name="close_button_text" msgid="3937902162644062866">"Qapadın"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> seçilib</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> seçilib</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Bu cihazı məhdudiyyətsiz istifadə etmək üçün zavod sıfırlaması edin"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Daha çox məlumat üçün toxunun."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> deaktiv edildi"</string> </resources> diff --git a/core/res/res/values-b+sr+Latn/strings.xml b/core/res/res/values-b+sr+Latn/strings.xml index 091d02a8e78e..1d05cc3399a2 100644 --- a/core/res/res/values-b+sr+Latn/strings.xml +++ b/core/res/res/values-b+sr+Latn/strings.xml @@ -607,7 +607,7 @@ <string name="phoneTypeRadio" msgid="4093738079908667513">"Radio"</string> <string name="phoneTypeTelex" msgid="3367879952476250512">"Teleks"</string> <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY TDD"</string> - <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Broj poslovnog mobilnog telefona"</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Poslovni mobilni"</string> <string name="phoneTypeWorkPager" msgid="649938731231157056">"Poslovni pejdžer"</string> <string name="phoneTypeAssistant" msgid="5596772636128562884">"Pomoćnik"</string> <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string> @@ -906,6 +906,46 @@ <item quantity="few">za <xliff:g id="COUNT_1">%d</xliff:g> god</item> <item quantity="other">za <xliff:g id="COUNT_1">%d</xliff:g> god</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="one">pre <xliff:g id="COUNT_1">%d</xliff:g> minuta</item> + <item quantity="few">pre <xliff:g id="COUNT_1">%d</xliff:g> minuta</item> + <item quantity="other">pre <xliff:g id="COUNT_1">%d</xliff:g> minuta</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="one">pre <xliff:g id="COUNT_1">%d</xliff:g> sata</item> + <item quantity="few">pre <xliff:g id="COUNT_1">%d</xliff:g> sata</item> + <item quantity="other">pre <xliff:g id="COUNT_1">%d</xliff:g> sati</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="one">Pre <xliff:g id="COUNT_1">%d</xliff:g> dana</item> + <item quantity="few">Pre <xliff:g id="COUNT_1">%d</xliff:g> dana</item> + <item quantity="other">Pre <xliff:g id="COUNT_1">%d</xliff:g> dana</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="one">pre <xliff:g id="COUNT_1">%d</xliff:g> godine</item> + <item quantity="few">pre <xliff:g id="COUNT_1">%d</xliff:g> godine</item> + <item quantity="other">pre <xliff:g id="COUNT_1">%d</xliff:g> godina</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="one">za <xliff:g id="COUNT_1">%d</xliff:g> minut</item> + <item quantity="few">za <xliff:g id="COUNT_1">%d</xliff:g> minuta</item> + <item quantity="other">za <xliff:g id="COUNT_1">%d</xliff:g> minuta</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="one">za <xliff:g id="COUNT_1">%d</xliff:g> sat</item> + <item quantity="few">za <xliff:g id="COUNT_1">%d</xliff:g> sata</item> + <item quantity="other">za <xliff:g id="COUNT_1">%d</xliff:g> sati</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="one">za <xliff:g id="COUNT_1">%d</xliff:g> dan</item> + <item quantity="few">za <xliff:g id="COUNT_1">%d</xliff:g> dana</item> + <item quantity="other">za <xliff:g id="COUNT_1">%d</xliff:g> dana</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="one">za <xliff:g id="COUNT_1">%d</xliff:g> godinu</item> + <item quantity="few">za <xliff:g id="COUNT_1">%d</xliff:g> godine</item> + <item quantity="other">za <xliff:g id="COUNT_1">%d</xliff:g> godina</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Problem sa video snimkom"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Ovaj video ne može da se strimuje na ovom uređaju."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Ne možete da pustite ovaj video."</string> @@ -977,8 +1017,7 @@ <string name="aerr_process" msgid="6201597323218674729">"Proces <xliff:g id="PROCESS">%1$s</xliff:g> je zaustavljen"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> se stalno zaustavlja"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"Proces <xliff:g id="PROCESS">%1$s</xliff:g> se stalno zaustavlja"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Ponovo pokreni aplikaciju"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Resetuj i ponovo pokreni aplikaciju"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Ponovo otvori aplikaciju"</string> <string name="aerr_report" msgid="5371800241488400617">"Pošaljite povratne informacije"</string> <string name="aerr_close" msgid="2991640326563991340">"Zatvori"</string> <string name="aerr_mute" msgid="1974781923723235953">"Ignoriši dok se uređaj ne pokrene ponovo"</string> @@ -1531,7 +1570,6 @@ <string name="deleted_key" msgid="7659477886625566590">"Izbrisali ste <xliff:g id="KEY">%1$s</xliff:g>"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> na poslu"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Da biste otkačili ovaj ekran, dodirnite i zadržite Nazad."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Da biste otkačili ovaj ekran, dodirnite i zadržite Pregled."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Aplikacija je zakačena: otkačinjanje nije dozvoljeno na ovom uređaju."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Ekran je zakačen"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Ekran je otkačen"</string> @@ -1606,6 +1644,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS zahtev je promenjen u USSD zahtev."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS zahtev je promenjen u novi SS zahtev."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Profil za Work"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Dugme Proširi"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"uključite/isključite proširenje"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB port za periferijske uređaje"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB port za periferijske uređaje"</string> @@ -1613,6 +1653,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Zatvori preklopni meni"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Uvećaj"</string> <string name="close_button_text" msgid="3937902162644062866">"Zatvori"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="one">Izabrana je <xliff:g id="COUNT_1">%1$d</xliff:g> stavka</item> <item quantity="few">Izabrane su <xliff:g id="COUNT_1">%1$d</xliff:g> stavke</item> @@ -1646,4 +1688,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Resetujte uređaj na fabrička podešavanja da biste ga koristili bez ograničenja"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Dodirnite da biste saznali više."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Vidžet <xliff:g id="LABEL">%1$s</xliff:g> je onemogućen"</string> </resources> diff --git a/core/res/res/values-be-rBY/strings.xml b/core/res/res/values-be-rBY/strings.xml index 4e419dc14312..b75410125308 100644 --- a/core/res/res/values-be-rBY/strings.xml +++ b/core/res/res/values-be-rBY/strings.xml @@ -594,7 +594,7 @@ <item msgid="1648797903785279353">"Jabber"</item> </string-array> <string name="phoneTypeCustom" msgid="1644738059053355820">"Карыстальніцкі"</string> - <string name="phoneTypeHome" msgid="2570923463033985887">"Галоўная старонка"</string> + <string name="phoneTypeHome" msgid="2570923463033985887">"Хатні"</string> <string name="phoneTypeMobile" msgid="6501463557754751037">"Мабільны"</string> <string name="phoneTypeWork" msgid="8863939667059911633">"Працоўны"</string> <string name="phoneTypeFaxWork" msgid="3517792160008890912">"Працоўны факс"</string> @@ -921,6 +921,54 @@ <item quantity="many">праз <xliff:g id="COUNT_1">%d</xliff:g> г.</item> <item quantity="other">праз <xliff:g id="COUNT_1">%d</xliff:g> г.</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> хвіліну таму</item> + <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> хвіліны таму</item> + <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> хвілін таму</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> хвіліны таму</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> гадзіну таму</item> + <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> гадзіны таму</item> + <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> гадзін таму</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> гадзіны таму</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> дзень таму</item> + <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> дні таму</item> + <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> дзён таму</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> дня таму</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> год таму</item> + <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> гады таму</item> + <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> гадоў таму</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> года таму</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="one">праз <xliff:g id="COUNT_1">%d</xliff:g> хвіліну</item> + <item quantity="few">праз <xliff:g id="COUNT_1">%d</xliff:g> хвіліны</item> + <item quantity="many">праз <xliff:g id="COUNT_1">%d</xliff:g> хвілін</item> + <item quantity="other">праз <xliff:g id="COUNT_1">%d</xliff:g> хвіліны</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="one">праз <xliff:g id="COUNT_1">%d</xliff:g> гадзіну</item> + <item quantity="few">праз <xliff:g id="COUNT_1">%d</xliff:g> гадзіны</item> + <item quantity="many">праз <xliff:g id="COUNT_1">%d</xliff:g> гадзін</item> + <item quantity="other">праз <xliff:g id="COUNT_1">%d</xliff:g> гадзіны</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="one">праз <xliff:g id="COUNT_1">%d</xliff:g> дзень</item> + <item quantity="few">праз <xliff:g id="COUNT_1">%d</xliff:g> дні</item> + <item quantity="many">праз <xliff:g id="COUNT_1">%d</xliff:g> дзён</item> + <item quantity="other">праз <xliff:g id="COUNT_1">%d</xliff:g> дня</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="one">праз <xliff:g id="COUNT_1">%d</xliff:g> год</item> + <item quantity="few">праз <xliff:g id="COUNT_1">%d</xliff:g> гады</item> + <item quantity="many">праз <xliff:g id="COUNT_1">%d</xliff:g> гадоў</item> + <item quantity="other">праз <xliff:g id="COUNT_1">%d</xliff:g> года</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Праблема з відэа"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Відэа не падыходзіць для патокавай перадачы на гэту прыладу."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Немагчыма прайграць гэта відэа."</string> @@ -960,7 +1008,7 @@ <string name="dialog_alert_title" msgid="2049658708609043103">"Увага"</string> <string name="loading" msgid="7933681260296021180">"Загрузка..."</string> <string name="capital_on" msgid="1544682755514494298">"Уключыць"</string> - <string name="capital_off" msgid="6815870386972805832">"Адключана"</string> + <string name="capital_off" msgid="6815870386972805832">"Выключана"</string> <string name="whichApplication" msgid="4533185947064773386">"Завяршыць дзеянне з дапамогай"</string> <string name="whichApplicationNamed" msgid="8260158865936942783">"Завяршыць дзеянне з дапамогай %1$s"</string> <string name="whichApplicationLabel" msgid="7425855495383818784">"Завяршыць дзеянне"</string> @@ -992,8 +1040,7 @@ <string name="aerr_process" msgid="6201597323218674729">"Працэс <xliff:g id="PROCESS">%1$s</xliff:g> спыніўся"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> шматразова спыняе працу"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> шматразова спыняе працу"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Перазапусціць праграму"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Скінуць і перазапусціць праграму"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Адкрыць праграму зноў"</string> <string name="aerr_report" msgid="5371800241488400617">"Адправіць водгук"</string> <string name="aerr_close" msgid="2991640326563991340">"Закрыць"</string> <string name="aerr_mute" msgid="1974781923723235953">"Адключыць гук да перазагрузкі прылады"</string> @@ -1550,7 +1597,6 @@ <string name="deleted_key" msgid="7659477886625566590">"Выдалена: <xliff:g id="KEY">%1$s</xliff:g>"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> (праца)"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Каб адмацаваць гэты экран, дакраніцеся і ўтрымлівайце кнопку \"Назад\"."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Каб адмацаваць гэты экран, дакраніцеся і ўтрымлівайце кнопку \"Агляд\"."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Праграма замацавана: адмацаванне на гэтай прыладзе не дапускаецца."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Экран замацаваны"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Экран адмацаваны"</string> @@ -1633,6 +1679,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Запыт SS зменены на запыт USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Запыт SS зменены на новы запыт SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Працоўны профіль"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Кнопка \"Разгарнуць\""</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"разгарнуць/згарнуць"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Перыферыйны USB-порт Android"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"Перыферыйны USB-порт"</string> @@ -1640,6 +1688,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Закрыць лішак"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Разгарнуць"</string> <string name="close_button_text" msgid="3937902162644062866">"Закрыць"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> выбраны</item> <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> выбрана</item> @@ -1674,4 +1724,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Выканайце скід да заводскіх налад, каб выкарыстоўваць гэту прыладу без абмежаванняў"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Краніце, каб даведацца больш."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Адключаны <xliff:g id="LABEL">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index 2f41788c5ede..912a3f458e86 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -891,6 +891,38 @@ <item quantity="other">след <xliff:g id="COUNT_1">%d</xliff:g> г</item> <item quantity="one">след <xliff:g id="COUNT_0">%d</xliff:g> г</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other">преди <xliff:g id="COUNT_1">%d</xliff:g> минути</item> + <item quantity="one">преди <xliff:g id="COUNT_0">%d</xliff:g> минута</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other">преди <xliff:g id="COUNT_1">%d</xliff:g> часа</item> + <item quantity="one">преди <xliff:g id="COUNT_0">%d</xliff:g> час</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other">преди <xliff:g id="COUNT_1">%d</xliff:g> дни</item> + <item quantity="one">преди <xliff:g id="COUNT_0">%d</xliff:g> ден</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other">преди <xliff:g id="COUNT_1">%d</xliff:g> години</item> + <item quantity="one">преди <xliff:g id="COUNT_0">%d</xliff:g> година</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other">след <xliff:g id="COUNT_1">%d</xliff:g> минути</item> + <item quantity="one">след <xliff:g id="COUNT_0">%d</xliff:g> минута</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other">след <xliff:g id="COUNT_1">%d</xliff:g> часа</item> + <item quantity="one">след <xliff:g id="COUNT_0">%d</xliff:g> час</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other">след <xliff:g id="COUNT_1">%d</xliff:g> дни</item> + <item quantity="one">след <xliff:g id="COUNT_0">%d</xliff:g> ден</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other">след <xliff:g id="COUNT_1">%d</xliff:g> години</item> + <item quantity="one">след <xliff:g id="COUNT_0">%d</xliff:g> година</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Проблем с видеоклипа"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Този видеоклип не е валиден за поточно предаване към това устройство."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Този видеоклип не може да се пусне."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> спря"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> спира многократно"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> спира многократно"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Рестартиране на приложението"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Нулиране и рестартиране на приложението"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Повторно отваряне на приложението"</string> <string name="aerr_report" msgid="5371800241488400617">"Изпращане на отзиви"</string> <string name="aerr_close" msgid="2991640326563991340">"Затваряне"</string> <string name="aerr_mute" msgid="1974781923723235953">"Спиране, докато устройството се рестартира"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"Изтрихте <xliff:g id="KEY">%1$s</xliff:g>"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> за работа"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"За да освободите този екран, докоснете и задръжте бутона за връщане назад."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"За да освободите този екран, докоснете и задръжте бутона за общ преглед."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Приложението е фиксирано. Освобождаването му не е разрешено на това устройство."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Екранът е фиксиран"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Екранът е освободен"</string> @@ -1523,7 +1553,7 @@ <string name="package_updated_device_owner" msgid="8856631322440187071">"Актуализирано от администратора ви"</string> <string name="package_deleted_device_owner" msgid="7650577387493101353">"Изтрито от администратора ви"</string> <string name="battery_saver_description" msgid="1960431123816253034">"С цел удължаване на живота на батерията режимът за запазването й намалява ефективността на устройството ви и ограничава вибрирането, услугите за местоположение и повечето данни на заден план. Приложенията за електронна поща, съобщения и др., които разчитат на синхронизиране, може да не се актуализират, освен ако не ги отворите.\n\nРежимът за запазване на батерията се изключва автоматично, когато устройството ви се зарежда."</string> - <string name="data_saver_description" msgid="6015391409098303235">"С цел намаляване на преноса на данни функцията за икономия на данни не позволява на някои приложения да изпращат или получават данни на заден план. Понастоящем използвано от вас приложение може да осъществява достъп до информацията, но по-рядко. Това например може да означава, че изображенията не се показват, докато не ги докоснете."</string> + <string name="data_saver_description" msgid="6015391409098303235">"С цел намаляване на преноса на данни функцията за икономия на данни не позволява на някои приложения да изпращат или получават данни на заден план. Понастоящем използвано от вас приложение може да използва данни, но по-рядко. Това например може да означава, че изображенията не се показват, докато не ги докоснете."</string> <string name="data_saver_enable_title" msgid="4674073932722787417">"Ще вкл. ли Икономия на данни?"</string> <string name="data_saver_enable_button" msgid="7147735965247211818">"Включване"</string> <plurals name="zen_mode_duration_minutes_summary" formatted="false" msgid="4367877408072000848"> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS заявката е променена на USSD заявка."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS заявката е променена на нова SS заявка."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Служебен потребителски профил"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Бутон за разгъване"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"превключване на разгъването"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Периферен USB порт под Android"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"Периферен USB порт"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Затваряне на менюто при препълване"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Увеличаване"</string> <string name="close_button_text" msgid="3937902162644062866">"Затваряне"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other">Избрахте <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="one">Избрахте <xliff:g id="COUNT_0">%1$d</xliff:g></item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"-<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Възстановете фабричните настройки на това устройство, за да го използвате без ограничения"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Докоснете, за да научите повече."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g>: Деактивирано"</string> </resources> diff --git a/core/res/res/values-bn-rBD/strings.xml b/core/res/res/values-bn-rBD/strings.xml index eb6ee1a7a379..ef5f1772bafe 100644 --- a/core/res/res/values-bn-rBD/strings.xml +++ b/core/res/res/values-bn-rBD/strings.xml @@ -160,7 +160,7 @@ <string name="httpErrorFile" msgid="2170788515052558676">"ফাইল অ্যাক্সেস করা যায়নি৷"</string> <string name="httpErrorFileNotFound" msgid="6203856612042655084">"অনুরোধ করা ফাইলটি খুঁজে পাওয়া যায়নি৷"</string> <string name="httpErrorTooManyRequests" msgid="1235396927087188253">"অনেকগুলি অনুরোধের প্রক্রিয়া করা হচ্ছে৷ পরে আবার চেষ্টা করুন৷"</string> - <string name="notification_title" msgid="8967710025036163822">"<xliff:g id="ACCOUNT">%1$s</xliff:g> এ সাইন ইন ত্রুটি"</string> + <string name="notification_title" msgid="8967710025036163822">"<xliff:g id="ACCOUNT">%1$s</xliff:g> এ প্রবেশ করুন ত্রুটি"</string> <string name="contentServiceSync" msgid="8353523060269335667">"সিঙ্ক"</string> <string name="contentServiceSyncNotificationTitle" msgid="397743349191901458">"সিঙ্ক"</string> <string name="contentServiceTooManyDeletesNotificationDesc" msgid="8100981435080696431">"অনেকগুলি <xliff:g id="CONTENT_TYPE">%s</xliff:g> মুছে ফেলা হয়েছে৷"</string> @@ -292,7 +292,7 @@ <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"আপনার ডিভাইস দ্বারা প্রাপ্ত সেল সম্প্রচার পড়তে অ্যাপ্লিকেশানটিকে অনুমতি দেয়৷ কয়েকটি স্থানে আপনাকে জরুরি অবস্থার জন্য সতর্ক করতে জরুরি সতর্কতাগুলি বিতরণ করা হয়৷ যখন একটি জরুরি সেল সম্প্রচার প্রাপ্ত হয় তখন ক্ষতিকারক অ্যাপ্লিকেশানগুলি আপনার ডিভাইসের কার্য সম্পাদনা বা কার্যকলাপে প্রতিবন্ধকতার সৃষ্টি করতে পারে৷"</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"গ্রাহক হিসাবে নেওয়া ফিডগুলি পড়ে"</string> <string name="permdesc_subscribedFeedsRead" msgid="5557058907906144505">"অ্যাপ্লিকেশানকে বর্তমানে সিঙ্ক করা ফিডগুলির সম্পর্কে বিবরণ পেতে দেয়৷"</string> - <string name="permlab_sendSms" msgid="7544599214260982981">"SMS পাঠানো ও দেখা,আপনি কি পরিচিতি কে এগুলি করার মঞ্জুরি দেবেন?"</string> + <string name="permlab_sendSms" msgid="7544599214260982981">"SMS পাঠানো ও দেখা,আপনি কি পরিচিতি কে এগুলি করার অনুমতি দেবেন?"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"অ্যাপ্লিকেশানটিকে SMS বার্তাগুলি পাঠাতে অনুমতি দেয়৷ এর জন্য অপ্রত্যাশিত চার্জ কাটা হতে পারে৷ ক্ষতিকারক অ্যাপ্লিকেশানগুলি আপনার নিশ্চিতকরণ ছাড়া বার্তা পাঠানোর মাধ্যমে আপনাকে অর্থ চার্জ করতে পারে৷"</string> <string name="permlab_readSms" msgid="8745086572213270480">"আপনার পাঠ্য বার্তা পড়ুন (SMS বা MMS)"</string> <string name="permdesc_readSms" product="tablet" msgid="2467981548684735522">"অ্যাপ্লিকেশানটিকে আপনার ট্যাবলেটে বা আপনার সিম কার্ডে সংরক্ষিত SMS বার্তাগুলি পড়ার অনুমতি দেয়৷ এটি অ্যাপ্লিকেশানটিকে সামগ্রী বা গোপনীয়তার সমস্ত SMS বার্তা নির্বিশেষে পড়ার অনুমতি দেয়৷"</string> @@ -545,7 +545,7 @@ <string name="policylab_disableKeyguardFeatures" msgid="8552277871075367771">"কিছু স্ক্রীন লক বৈশিষ্ট্য অক্ষম করুন"</string> <string name="policydesc_disableKeyguardFeatures" msgid="2044755691354158439">"কিছু স্ক্রীন লক বৈশিষ্ট্যের ব্যবহার আটকান।"</string> <string-array name="phoneTypes"> - <item msgid="8901098336658710359">"হোম"</item> + <item msgid="8901098336658710359">"বাড়ি"</item> <item msgid="869923650527136615">"মোবাইল"</item> <item msgid="7897544654242874543">"কর্মক্ষেত্র"</item> <item msgid="1103601433382158155">"কর্মক্ষেত্রের ফ্যাক্স"</item> @@ -555,19 +555,19 @@ <item msgid="9192514806975898961">"কাস্টম"</item> </string-array> <string-array name="emailAddressTypes"> - <item msgid="8073994352956129127">"হোম"</item> + <item msgid="8073994352956129127">"বাড়ি"</item> <item msgid="7084237356602625604">"কর্মক্ষেত্র"</item> <item msgid="1112044410659011023">"অন্যান্য"</item> <item msgid="2374913952870110618">"কাস্টম"</item> </string-array> <string-array name="postalAddressTypes"> - <item msgid="6880257626740047286">"হোম"</item> + <item msgid="6880257626740047286">"বাড়ি"</item> <item msgid="5629153956045109251">"কর্মক্ষেত্র"</item> <item msgid="4966604264500343469">"অন্যান্য"</item> <item msgid="4932682847595299369">"কাস্টম"</item> </string-array> <string-array name="imAddressTypes"> - <item msgid="1738585194601476694">"হোম"</item> + <item msgid="1738585194601476694">"বাড়ি"</item> <item msgid="1359644565647383708">"কর্মক্ষেত্র"</item> <item msgid="7868549401053615677">"অন্যান্য"</item> <item msgid="3145118944639869809">"কাস্টম"</item> @@ -588,7 +588,7 @@ <item msgid="1648797903785279353">"Jabber"</item> </string-array> <string name="phoneTypeCustom" msgid="1644738059053355820">"কাস্টম"</string> - <string name="phoneTypeHome" msgid="2570923463033985887">"হোম"</string> + <string name="phoneTypeHome" msgid="2570923463033985887">"বাড়ি"</string> <string name="phoneTypeMobile" msgid="6501463557754751037">"মোবাইল"</string> <string name="phoneTypeWork" msgid="8863939667059911633">"কর্মক্ষেত্র"</string> <string name="phoneTypeFaxWork" msgid="3517792160008890912">"কর্মক্ষেত্রের ফ্যাক্স"</string> @@ -613,16 +613,16 @@ <string name="eventTypeAnniversary" msgid="3876779744518284000">"বার্ষিকী"</string> <string name="eventTypeOther" msgid="7388178939010143077">"অন্যান্য"</string> <string name="emailTypeCustom" msgid="8525960257804213846">"কাস্টম"</string> - <string name="emailTypeHome" msgid="449227236140433919">"হোম"</string> + <string name="emailTypeHome" msgid="449227236140433919">"বাড়ি"</string> <string name="emailTypeWork" msgid="3548058059601149973">"কর্মক্ষেত্র"</string> <string name="emailTypeOther" msgid="2923008695272639549">"অন্যান্য"</string> <string name="emailTypeMobile" msgid="119919005321166205">"মোবাইল"</string> <string name="postalTypeCustom" msgid="8903206903060479902">"কাস্টম"</string> - <string name="postalTypeHome" msgid="8165756977184483097">"হোম"</string> + <string name="postalTypeHome" msgid="8165756977184483097">"বাড়ি"</string> <string name="postalTypeWork" msgid="5268172772387694495">"কর্মক্ষেত্র"</string> <string name="postalTypeOther" msgid="2726111966623584341">"অন্যান্য"</string> <string name="imTypeCustom" msgid="2074028755527826046">"কাস্টম"</string> - <string name="imTypeHome" msgid="6241181032954263892">"হোম"</string> + <string name="imTypeHome" msgid="6241181032954263892">"বাড়ি"</string> <string name="imTypeWork" msgid="1371489290242433090">"কর্মক্ষেত্র"</string> <string name="imTypeOther" msgid="5377007495735915478">"অন্যান্য"</string> <string name="imProtocolCustom" msgid="6919453836618749992">"কাস্টম"</string> @@ -654,7 +654,7 @@ <string name="relationTypeSister" msgid="1735983554479076481">"বোন"</string> <string name="relationTypeSpouse" msgid="394136939428698117">"স্বামী বা স্ত্রী"</string> <string name="sipAddressTypeCustom" msgid="2473580593111590945">"কাস্টম"</string> - <string name="sipAddressTypeHome" msgid="6093598181069359295">"হোম"</string> + <string name="sipAddressTypeHome" msgid="6093598181069359295">"বাড়ি"</string> <string name="sipAddressTypeWork" msgid="6920725730797099047">"কর্মক্ষেত্র"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"অন্যান্য"</string> <string name="quick_contacts_not_available" msgid="746098007828579688">"এই পরিচিতিটি দেখার জন্য কোনো অ্যাপ্লিকেশান খুঁজে পাওয়া যায়নি৷"</string> @@ -703,9 +703,9 @@ <string name="lockscreen_too_many_failed_attempts_dialog_message" msgid="6481623830344107222">"আপনি আপনার আনলকের প্যাটার্ন আঁকার ক্ষেত্রে <xliff:g id="NUMBER_0">%1$d</xliff:g> বার ভুল করেছেন৷ \n\n<xliff:g id="NUMBER_1">%2$d</xliff:g> সেকেন্ডের মধ্যে আবার চেষ্টা করুন৷"</string> <string name="lockscreen_too_many_failed_password_attempts_dialog_message" msgid="2725973286239344555">"আপনি আপনার পাসওয়ার্ড <xliff:g id="NUMBER_0">%1$d</xliff:g> বার ভুল টাইপ করেছেন৷ \n\n<xliff:g id="NUMBER_1">%2$d</xliff:g> সেকেন্ডের মধ্যে আবার চেষ্টা করুন৷"</string> <string name="lockscreen_too_many_failed_pin_attempts_dialog_message" msgid="6216672706545696955">"আপনি আপনার পাসওয়ার্ড <xliff:g id="NUMBER_0">%1$d</xliff:g> বার ভুল টাইপ করেছেন৷ \n\n<xliff:g id="NUMBER_1">%2$d</xliff:g> সেকেন্ডের মধ্যে আবার চেষ্টা করুন৷"</string> - <string name="lockscreen_failed_attempts_almost_glogin" product="tablet" msgid="9191611984625460820">"আপনি <xliff:g id="NUMBER_0">%1$d</xliff:g> বার ভুল করে আপনার আনলক প্যাটার্ন অঙ্কিত করেছেন৷ আপনি <xliff:g id="NUMBER_1">%2$d</xliff:g>টি অসফল প্রচেষ্টার পরে, আপনাকে Google সাইন ইন দিয়ে আপনার ট্যাবলেট আনলক করার কথা বলা হবে৷\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> সেকেন্ড পরে আবার চেষ্টা করুন৷"</string> - <string name="lockscreen_failed_attempts_almost_glogin" product="tv" msgid="5316664559603394684">"আপনি <xliff:g id="NUMBER_0">%1$d</xliff:g> বার ভুল করে আপনার আনলক প্যাটার্ন অঙ্কিত করেছেন৷ আপনি <xliff:g id="NUMBER_1">%2$d</xliff:g>টি অসফল প্রচেষ্টার পরে, আপনাকে Google সাইন ইন দিয়ে আপনার টিভি আনলক করার কথা বলা হবে৷\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> সেকেন্ড পরে আবার চেষ্টা করুন৷"</string> - <string name="lockscreen_failed_attempts_almost_glogin" product="default" msgid="2590227559763762751">"আপনি <xliff:g id="NUMBER_0">%1$d</xliff:g> বার ভুল করে আপনার আনলক প্যাটার্ন অঙ্কিত করেছেন৷ আপনি <xliff:g id="NUMBER_1">%2$d</xliff:g>টি অসফল প্রচেষ্টার পরে, আপনাকে Google সাইন ইন দিয়ে আপনার ফোন আনলক করার কথা বলা হবে৷\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> সেকেন্ড পরে আবার চেষ্টা করুন৷"</string> + <string name="lockscreen_failed_attempts_almost_glogin" product="tablet" msgid="9191611984625460820">"আপনি <xliff:g id="NUMBER_0">%1$d</xliff:g> বার ভুল করে আপনার আনলক প্যাটার্ন অঙ্কিত করেছেন৷ আপনি <xliff:g id="NUMBER_1">%2$d</xliff:g>টি অসফল প্রচেষ্টার পরে, আপনাকে Google প্রবেশ করুন দিয়ে আপনার ট্যাবলেট আনলক করার কথা বলা হবে৷\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> সেকেন্ড পরে আবার চেষ্টা করুন৷"</string> + <string name="lockscreen_failed_attempts_almost_glogin" product="tv" msgid="5316664559603394684">"আপনি <xliff:g id="NUMBER_0">%1$d</xliff:g> বার ভুল করে আপনার আনলক প্যাটার্ন অঙ্কিত করেছেন৷ আপনি <xliff:g id="NUMBER_1">%2$d</xliff:g>টি অসফল প্রচেষ্টার পরে, আপনাকে Google প্রবেশ করুন দিয়ে আপনার টিভি আনলক করার কথা বলা হবে৷\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> সেকেন্ড পরে আবার চেষ্টা করুন৷"</string> + <string name="lockscreen_failed_attempts_almost_glogin" product="default" msgid="2590227559763762751">"আপনি <xliff:g id="NUMBER_0">%1$d</xliff:g> বার ভুল করে আপনার আনলক প্যাটার্ন অঙ্কিত করেছেন৷ আপনি <xliff:g id="NUMBER_1">%2$d</xliff:g>টি অসফল প্রচেষ্টার পরে, আপনাকে Google প্রবেশ করুন দিয়ে আপনার ফোন আনলক করার কথা বলা হবে৷\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> সেকেন্ড পরে আবার চেষ্টা করুন৷"</string> <string name="lockscreen_failed_attempts_almost_at_wipe" product="tablet" msgid="6128106399745755604">"আপনি <xliff:g id="NUMBER_0">%1$d</xliff:g> বার ভুল করে ট্যাবলেটটি আনলক করার চেষ্টা করেছেন৷ আরো <xliff:g id="NUMBER_1">%2$d</xliff:g>টি অসফল চেষ্টার পরে, ট্যাবলেটটি ফ্যাক্টরী ডিফল্টে রিসেট হবে এবং ব্যবহারকারীর সমস্ত ডেটা মুছে যাবে৷"</string> <string name="lockscreen_failed_attempts_almost_at_wipe" product="tv" msgid="950408382418270260">"আপনি <xliff:g id="NUMBER_0">%1$d</xliff:g> বার ভুল করে টিভি আনলক করার চেষ্টা করেছেন৷ <xliff:g id="NUMBER_1">%2$d</xliff:g>টি অসফল প্রচেষ্টার পরে, আপনার টিভি ফ্যাক্টরি ডিফল্টে পুনঃসেট হবে এবং সমস্ত ব্যবহারকারীর ডেটা মুছে যাবে৷"</string> <string name="lockscreen_failed_attempts_almost_at_wipe" product="default" msgid="8603565142156826565">"আপনি <xliff:g id="NUMBER_0">%1$d</xliff:g> বার ভুল করে ফোনটি আনলক করার চেষ্টা করেছেন৷ আরো <xliff:g id="NUMBER_1">%2$d</xliff:g>টি অসফল চেষ্টার পরে, ফোনটি ফ্যাক্টরী ডিফল্টে রিসেট হবে এবং ব্যবহারকারীর সমস্ত ডেটা মুছে যাবে৷"</string> @@ -716,10 +716,10 @@ <string name="lockscreen_forgot_pattern_button_text" msgid="2626999449610695930">"প্যাটার্ন ভুলে গেছেন?"</string> <string name="lockscreen_glogin_forgot_pattern" msgid="2588521501166032747">"অ্যাকাউন্ট আনলক করুন"</string> <string name="lockscreen_glogin_too_many_attempts" msgid="2751368605287288808">"বিভিন্ন প্যাটার্নের সাহায্যে খুব বেশি বার প্রচেষ্টা করা হয়ে গেছে"</string> - <string name="lockscreen_glogin_instructions" msgid="3931816256100707784">"আনলক করতে আপনার Google অ্যাকাউন্টের মাধ্যমে সাইন ইন করুন৷"</string> + <string name="lockscreen_glogin_instructions" msgid="3931816256100707784">"আনলক করতে আপনার Google অ্যাকাউন্টের মাধ্যমে প্রবেশ করুন করুন৷"</string> <string name="lockscreen_glogin_username_hint" msgid="8846881424106484447">"ব্যবহারকারীনাম (ইমেল)"</string> <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"পাসওয়ার্ড"</string> - <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"সাইন ইন"</string> + <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"প্রবেশ করুন"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"অবৈধ ব্যবহারকারী নাম অথবা পাসওয়ার্ড৷"</string> <string name="lockscreen_glogin_account_recovery_hint" msgid="1696924763690379073">"আপনার ব্যবহারকারী নাম অথবা পাসওয়ার্ড ভুলে গেছেন?\n"<b>"google.com/accounts/recovery"</b>" এ যান৷"</string> <string name="lockscreen_glogin_checking_password" msgid="7114627351286933867">"পরীক্ষা করা হচ্ছে..."</string> @@ -891,6 +891,38 @@ <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g>বছরের মধ্যে</item> <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>বছরের মধ্যে</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g>মিনিট আগে</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>মিনিট আগে</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ঘণ্টা আগে</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ঘণ্টা আগে</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> দিন আগে</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> দিন আগে</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> বছর আগে</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> বছর আগে</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="one"> <xliff:g id="COUNT_1">%d</xliff:g> মিনিটের মধ্যে</item> + <item quantity="other"> <xliff:g id="COUNT_1">%d</xliff:g> মিনিটের মধ্যে</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ঘন্টার মধ্যে</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ঘন্টার মধ্যে</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> দিনের মধ্যে</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> দিনের মধ্যে</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="one"> <xliff:g id="COUNT_1">%d</xliff:g> বছরের মধ্যে</item> + <item quantity="other"> <xliff:g id="COUNT_1">%d</xliff:g> বছরের মধ্যে</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"ভিডিও সমস্যা"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"এই ভিডিওটি এই ডিভাইসে স্ট্রিমিং করার জন্য বৈধ নয়৷"</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"এই ভিডিওটি চালানো যাবে না৷"</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> বন্ধ হয়েছে"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> বারবার বন্ধ হচ্ছে"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> বারবার বন্ধ হচ্ছে"</string> - <string name="aerr_restart" msgid="9001379185665886595">"অ্যাপ্লিকেশান পুনরায় আরম্ভ করুন"</string> - <string name="aerr_reset" msgid="7645427603514220451">"পুনরায় সেট করুন এবং অ্যাপ্লিকেশান পুনরায় আরম্ভ করুন"</string> + <string name="aerr_restart" msgid="7581308074153624475">"অ্যাপ্লিকেশানটিকে আবার খুলুন"</string> <string name="aerr_report" msgid="5371800241488400617">"প্রতিক্রিয়া পাঠান"</string> <string name="aerr_close" msgid="2991640326563991340">"বন্ধ করুন"</string> <string name="aerr_mute" msgid="1974781923723235953">"ডিভাইসটি পুনরায় আরম্ভ না হওয়া পর্যন্ত নিঃশব্দ করুন"</string> @@ -1035,15 +1066,15 @@ <item quantity="one">খোলা ওয়াই-ফাই নেটওয়ার্কগুলি উপলব্ধ রয়েছে</item> <item quantity="other">খোলা ওয়াই-ফাই নেটওয়ার্কগুলি উপলব্ধ রয়েছে</item> </plurals> - <string name="wifi_available_sign_in" msgid="9157196203958866662">"ওয়াই-ফাই নেটওয়ার্কে সাইন ইন করুন"</string> - <string name="network_available_sign_in" msgid="1848877297365446605">"নেটওয়ার্কে সাইন ইন করুন"</string> + <string name="wifi_available_sign_in" msgid="9157196203958866662">"ওয়াই-ফাই নেটওয়ার্কে প্রবেশ করুন করুন"</string> + <string name="network_available_sign_in" msgid="1848877297365446605">"নেটওয়ার্কে প্রবেশ করুন করুন"</string> <!-- no translation found for network_available_sign_in_detailed (8000081941447976118) --> <skip /> <string name="wifi_no_internet" msgid="8451173622563841546">"ওয়াই-ফাই -তে কোনো ইন্টারনেট অ্যাক্সেস নেই"</string> <string name="wifi_no_internet_detailed" msgid="8083079241212301741">"বিকল্পগুলির জন্য আলতো চাপুন"</string> <string name="wifi_watchdog_network_disabled" msgid="7904214231651546347">"ওয়াই-ফাই এর সাথে সংযোগ করা যায়নি"</string> <string name="wifi_watchdog_network_disabled_detailed" msgid="5548780776418332675">" একটি দুর্বল ইন্টারনেট সংযোগ রয়েছে৷"</string> - <string name="wifi_connect_alert_title" msgid="8455846016001810172">"সংযোগের মঞ্জুরি দেবেন?"</string> + <string name="wifi_connect_alert_title" msgid="8455846016001810172">"সংযোগের অনুমতি দেবেন?"</string> <string name="wifi_connect_alert_message" msgid="6451273376815958922">"অ্যাপ্লিকেশান %1$s Wifi নেটওয়ার্ক %2$s এর সাথে সংযোগ করতে চায়"</string> <string name="wifi_connect_default_application" msgid="7143109390475484319">"একটি অ্যাপ্লিকেশান"</string> <string name="wifi_p2p_dialog_title" msgid="97611782659324517">"ওয়াই-ফাই ডাইরেক্ট"</string> @@ -1366,10 +1397,10 @@ <string name="kg_invalid_puk" msgid="3638289409676051243">"সঠিক PUK কোড পুনরায় লিখুন৷ বার বার প্রচেষ্টা করা হলে তা স্থায়ীভাবে সিমটিকে অক্ষম করে দেবে৷"</string> <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"পিন কোডগুলি মিলছে না"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"বিভিন্ন প্যাটার্নের সাহায্যে খুব বেশি বার প্রচেষ্টা করা হয়ে গেছে"</string> - <string name="kg_login_instructions" msgid="1100551261265506448">"আনলক করতে আপনার Google অ্যাকাউন্টের মাধ্যমে সাইন ইন করুন৷"</string> + <string name="kg_login_instructions" msgid="1100551261265506448">"আনলক করতে আপনার Google অ্যাকাউন্টের মাধ্যমে প্রবেশ করুন করুন৷"</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"ব্যবহারকারী নাম (ইমেল)"</string> <string name="kg_login_password_hint" msgid="9057289103827298549">"পাসওয়ার্ড"</string> - <string name="kg_login_submit_button" msgid="5355904582674054702">"সাইন ইন করুন"</string> + <string name="kg_login_submit_button" msgid="5355904582674054702">"প্রবেশ করুন করুন"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"অবৈধ ব্যবহারকারী নাম অথবা পাসওয়ার্ড৷"</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"আপনার ব্যবহারকারী নাম অথবা পাসওয়ার্ড ভুলে গেছেন?\n"<b>"google.com/accounts/recovery"</b>" এ যান৷"</string> <string name="kg_login_checking_password" msgid="1052685197710252395">"অ্যাকাউন্ট পরীক্ষা করা হচ্ছে..."</string> @@ -1515,7 +1546,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> মুছে ফেলা হয়েছে"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"কর্মক্ষেত্র <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"এই স্ক্রীনটিকে আনপিন করতে, \'ফিরুন\' স্পর্শ করুন এবং ধরে রাখুন৷"</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"এই স্ক্রীনটিকে আনপিন করতে, \'ওভারভিউ\' স্পর্শ করুন এবং ধরে রাখুন৷"</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"অ্যাপ্লিকেশান পিন করা আছে: এই ডিভাইস এটিকে পিনমুক্ত করা মঞ্জুরিপ্রাপ্ত নয়৷"</string> <string name="lock_to_app_start" msgid="6643342070839862795">"স্ক্রীন পিন করা হয়েছে"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"পিন না করা স্ক্রীন"</string> @@ -1582,6 +1612,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS অনুরোধটিকে নতুন USSD অনুরোধে রুপান্তরিত করা হয়েছে৷"</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS অনুরোধটিকে নতুন SS অনুরোধে রুপান্তরিত করা হয়েছে৷"</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"কর্মস্থলের প্রোফাইল"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"প্রসারিত করার বোতাম"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"টগল সম্প্রসারণ"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB পেরিফেরাল পোর্ট"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB পেরিফেরাল পোর্ট"</string> @@ -1589,6 +1621,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"ওভারফ্লো বন্ধ করুন"</string> <string name="maximize_button_text" msgid="7543285286182446254">"বড় করুন"</string> <string name="close_button_text" msgid="3937902162644062866">"বন্ধ করুন"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g>টি নির্বাচন করা হয়েছে</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g>টি নির্বাচন করা হয়েছে</item> @@ -1604,7 +1638,7 @@ <string name="language_picker_section_all" msgid="3097279199511617537">"সকল ভাষা"</string> <string name="locale_search_menu" msgid="2560710726687249178">"অনুসন্ধান করুন"</string> <string name="work_mode_off_title" msgid="8954725060677558855">"কাজের মোড বন্ধ আছে"</string> - <string name="work_mode_off_message" msgid="3286169091278094476">"অ্যাপ্লিকেশান, পটভূমি সিঙ্ক এবং সম্পর্কিত বৈশিষ্ট্যগুলি সহ কর্মস্থলের প্রোফাইলটিকে কাজ করার মঞ্জুরি দিন।"</string> + <string name="work_mode_off_message" msgid="3286169091278094476">"অ্যাপ্লিকেশান, পটভূমি সিঙ্ক এবং সম্পর্কিত বৈশিষ্ট্যগুলি সহ কর্মস্থলের প্রোফাইলটিকে কাজ করার অনুমতি দিন।"</string> <string name="work_mode_turn_on" msgid="2062544985670564875">"চালু করুন"</string> <string name="new_sms_notification_title" msgid="8442817549127555977">"আপনার নতুন বার্তা আছে"</string> <string name="new_sms_notification_content" msgid="7002938807812083463">"দেখার জন্য SMS অ্যাপ্লিকেশান খুলুন"</string> @@ -1621,4 +1655,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"কোনো বিধিনিষেধ ছাড়াই এই ডিভাইসটিকে ব্যবহার করতে ফ্যাক্টরি রিসেট করুন"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"আরো জানতে স্পর্শ করুন৷"</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"অক্ষম করা <xliff:g id="LABEL">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-bs-rBA/strings.xml b/core/res/res/values-bs-rBA/strings.xml index 1ea1c668ccb9..c12832acca40 100644 --- a/core/res/res/values-bs-rBA/strings.xml +++ b/core/res/res/values-bs-rBA/strings.xml @@ -906,6 +906,46 @@ <item quantity="few">za <xliff:g id="COUNT_1">%d</xliff:g> g</item> <item quantity="other">za <xliff:g id="COUNT_1">%d</xliff:g> g</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="one"> Prije <xliff:g id="COUNT_1">%d</xliff:g> minutu</item> + <item quantity="few"> Prije <xliff:g id="COUNT_1">%d</xliff:g> minute</item> + <item quantity="other"> Prije <xliff:g id="COUNT_1">%d</xliff:g> minuta</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="one"> Prije <xliff:g id="COUNT_1">%d</xliff:g> sat</item> + <item quantity="few"> Prije <xliff:g id="COUNT_1">%d</xliff:g> sata</item> + <item quantity="other"> Prije <xliff:g id="COUNT_1">%d</xliff:g> sati</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="one"> Prije <xliff:g id="COUNT_1">%d</xliff:g> dan</item> + <item quantity="few"> Prije <xliff:g id="COUNT_1">%d</xliff:g> dana</item> + <item quantity="other"> Prije <xliff:g id="COUNT_1">%d</xliff:g> dana</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="one"> Prije <xliff:g id="COUNT_1">%d</xliff:g> godinu</item> + <item quantity="few"> Prije <xliff:g id="COUNT_1">%d</xliff:g> godine</item> + <item quantity="other"> Prije <xliff:g id="COUNT_1">%d</xliff:g> godina</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="one"> za <xliff:g id="COUNT_1">%d</xliff:g> minutu</item> + <item quantity="few"> za <xliff:g id="COUNT_1">%d</xliff:g> minute</item> + <item quantity="other"> za <xliff:g id="COUNT_1">%d</xliff:g> minuta</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="one"> za <xliff:g id="COUNT_1">%d</xliff:g> sat</item> + <item quantity="few"> za <xliff:g id="COUNT_1">%d</xliff:g> sata</item> + <item quantity="other"> za <xliff:g id="COUNT_1">%d</xliff:g> sati</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="one"> za <xliff:g id="COUNT_1">%d</xliff:g> dan</item> + <item quantity="few"> za <xliff:g id="COUNT_1">%d</xliff:g> dana</item> + <item quantity="other"> za <xliff:g id="COUNT_1">%d</xliff:g> dana</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="one"> za <xliff:g id="COUNT_1">%d</xliff:g> godinu</item> + <item quantity="few"> za <xliff:g id="COUNT_1">%d</xliff:g> godine</item> + <item quantity="other"> za <xliff:g id="COUNT_1">%d</xliff:g> godina</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Problem sa prikazom video sadržaja"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Prijenos ovog video sadržaja ne može se izvršiti na ovom uređaju."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Greška prilikom reproduciranja video sadržaja."</string> @@ -939,9 +979,9 @@ <string name="app_running_notification_title" msgid="8718335121060787914">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> je pokrenuta"</string> <string name="app_running_notification_text" msgid="1197581823314971177">"Dodirnite za više informacija ili da biste zaustavili aplikaciju."</string> <string name="ok" msgid="5970060430562524910">"Uredu"</string> - <string name="cancel" msgid="6442560571259935130">"Prekini"</string> + <string name="cancel" msgid="6442560571259935130">"Otkaži"</string> <string name="yes" msgid="5362982303337969312">"Uredu"</string> - <string name="no" msgid="5141531044935541497">"Prekini"</string> + <string name="no" msgid="5141531044935541497">"Otkaži"</string> <string name="dialog_alert_title" msgid="2049658708609043103">"Pažnja"</string> <string name="loading" msgid="7933681260296021180">"Učitavanje..."</string> <string name="capital_on" msgid="1544682755514494298">"Uključeno"</string> @@ -979,8 +1019,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> je zaustavljen"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> se stalno zaustavlja"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> se stalno zaustavlja"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Ponovo pokreni aplikaciju"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Vrati aplikaciju na zadano i pokreni ponovo"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Ponovo otvori aplikaciju"</string> <string name="aerr_report" msgid="5371800241488400617">"Pošalji povratne informacije"</string> <string name="aerr_close" msgid="2991640326563991340">"Zatvori"</string> <string name="aerr_mute" msgid="1974781923723235953">"Isključiti zvuk dok se uređaj ponovo ne pokrene"</string> @@ -1279,7 +1318,7 @@ <string name="date_picker_prev_month_button" msgid="2858244643992056505">"Prethodni mjesec"</string> <string name="date_picker_next_month_button" msgid="5559507736887605055">"Sljedeći mjesec"</string> <string name="keyboardview_keycode_alt" msgid="4856868820040051939">"Alt"</string> - <string name="keyboardview_keycode_cancel" msgid="1203984017245783244">"Prekini"</string> + <string name="keyboardview_keycode_cancel" msgid="1203984017245783244">"Otkaži"</string> <string name="keyboardview_keycode_delete" msgid="3337914833206635744">"Izbriši"</string> <string name="keyboardview_keycode_done" msgid="1992571118466679775">"Gotovo"</string> <string name="keyboardview_keycode_mode_change" msgid="4547387741906537519">"Promjena načina rada"</string> @@ -1536,7 +1575,6 @@ <string name="deleted_key" msgid="7659477886625566590">"Broj <xliff:g id="KEY">%1$s</xliff:g> je izbrisan"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"Poslovni <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Da biste otkačili ovaj ekran, dodirnite i držite dugme Nazad."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Da biste otkačili ovaj ekran, dodirnite i držite dugme Pregled."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Aplikacija je prikačena. Na ovom uređaju nije dozvoljeno otkačivanje."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Ekran je zakačen"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Ekran je otkačen"</string> @@ -1611,6 +1649,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS zahtjev je izmijenjen u USSD zahtjev."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS zahtjev je izmijenjen u novi SS zahtjev."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Profil za posao"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Dugme za proširivanje"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"prebaci na proširenje"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB ulaz za periferijske uređaje"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB ulaz za periferijske uređaje"</string> @@ -1618,6 +1658,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Zatvori preklopni meni"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Povećaj maksimalno"</string> <string name="close_button_text" msgid="3937902162644062866">"Zatvori"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> stavka je odabrana</item> <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> stavke su odabrane</item> @@ -1651,4 +1693,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Vratite uređaj na fabričke postavke kako biste ga koristili bez ograničenja"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Dodirnite da saznate više."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Onemogućen <xliff:g id="LABEL">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index 948895c2055c..9727146beec1 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -405,7 +405,7 @@ <string name="permlab_changeNetworkState" msgid="958884291454327309">"canviar la connectivitat de xarxa"</string> <string name="permdesc_changeNetworkState" msgid="6789123912476416214">"Permet que l\'aplicació pugui canviar l\'estat de connectivitat de la xarxa."</string> <string name="permlab_changeTetherState" msgid="5952584964373017960">"Canvia la connectivitat de compartició de xarxa"</string> - <string name="permdesc_changeTetherState" msgid="1524441344412319780">"Permet que l\'aplicació canviï l\'estat de la connectivitat de la xarxa d\'ancoratge."</string> + <string name="permdesc_changeTetherState" msgid="1524441344412319780">"Permet que l\'aplicació canviï l\'estat de la connectivitat de la xarxa compartida."</string> <string name="permlab_accessWifiState" msgid="5202012949247040011">"veure connexions Wi-Fi"</string> <string name="permdesc_accessWifiState" msgid="5002798077387803726">"Permet que l\'aplicació visualitzi informació sobre les xarxes Wi-Fi, com ara si la Wi-Fi està activada i el nom dels dispositius Wi-Fi connectats."</string> <string name="permlab_changeWifiState" msgid="6550641188749128035">"connectar-se a xarxes Wi-Fi i desconnectar-se"</string> @@ -645,7 +645,7 @@ <string name="relationTypeDomesticPartner" msgid="6904807112121122133">"Parella"</string> <string name="relationTypeFather" msgid="5228034687082050725">"Pare"</string> <string name="relationTypeFriend" msgid="7313106762483391262">"Amic"</string> - <string name="relationTypeManager" msgid="6365677861610137895">"Gerent"</string> + <string name="relationTypeManager" msgid="6365677861610137895">"Gestor"</string> <string name="relationTypeMother" msgid="4578571352962758304">"Mare"</string> <string name="relationTypeParent" msgid="4755635567562925226">"Pare/mare"</string> <string name="relationTypePartner" msgid="7266490285120262781">"Partner"</string> @@ -891,6 +891,38 @@ <item quantity="other">d\'aquí a <xliff:g id="COUNT_1">%d</xliff:g> a</item> <item quantity="one">d\'aquí a <xliff:g id="COUNT_0">%d</xliff:g> a</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other">fa <xliff:g id="COUNT_1">%d</xliff:g> minuts</item> + <item quantity="one">fa <xliff:g id="COUNT_0">%d</xliff:g> minut</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other">fa <xliff:g id="COUNT_1">%d</xliff:g> hores</item> + <item quantity="one">fa <xliff:g id="COUNT_0">%d</xliff:g> hora</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other">fa <xliff:g id="COUNT_1">%d</xliff:g> dies</item> + <item quantity="one">fa <xliff:g id="COUNT_0">%d</xliff:g> dia</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other">fa <xliff:g id="COUNT_1">%d</xliff:g> anys</item> + <item quantity="one">fa <xliff:g id="COUNT_0">%d</xliff:g> any</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other">d\'aquí a <xliff:g id="COUNT_1">%d</xliff:g> minuts</item> + <item quantity="one">d\'aquí a <xliff:g id="COUNT_0">%d</xliff:g> minut</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other">d\'aquí a <xliff:g id="COUNT_1">%d</xliff:g> hores</item> + <item quantity="one">d\'aquí a <xliff:g id="COUNT_0">%d</xliff:g> hora</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other">d\'aquí a <xliff:g id="COUNT_1">%d</xliff:g> dies</item> + <item quantity="one">d\'aquí a <xliff:g id="COUNT_0">%d</xliff:g> dia</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other">d\'aquí a <xliff:g id="COUNT_1">%d</xliff:g> anys</item> + <item quantity="one">d\'aquí a <xliff:g id="COUNT_0">%d</xliff:g> any</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Problema amb el vídeo"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Aquest vídeo no és vàlid per a la reproducció en aquest dispositiu."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"No es pot reproduir aquest vídeo."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> s\'ha aturat"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"L\'aplicació <xliff:g id="APPLICATION">%1$s</xliff:g> s\'atura contínuament"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"El procés <xliff:g id="PROCESS">%1$s</xliff:g> s\'atura contínuament"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Reinicia l\'aplicació"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Restableix i reinicia l\'aplicació"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Torna a obrir l\'aplicació"</string> <string name="aerr_report" msgid="5371800241488400617">"Envia suggeriments"</string> <string name="aerr_close" msgid="2991640326563991340">"Tanca"</string> <string name="aerr_mute" msgid="1974781923723235953">"Silencia fins que es reiniciï el dispositiu"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> suprimit"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> de la feina"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Toca i mantén premuda l\'opció Enrere per deixar de fixar aquesta pantalla."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Toca i mantén premuda l\'opció Visió general per deixar de fixar aquesta pantalla."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"S\'ha fixat l\'aplicació. En aquest dispositiu no es permet anul·lar-ne la fixació."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Pantalla fixada"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Fixació de la pantalla anul·lada"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"La sol·licitud SS s\'ha transformat en una sol·licitud USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"La sol·licitud SS s\'ha transformat en una sol·licitud SS nova."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Perfil professional"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Botó Desplega"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"desplega o replega"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Port perifèric USB d\'Android"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"Port perifèric USB"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Tanca el menú addicional"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Maximitza"</string> <string name="close_button_text" msgid="3937902162644062866">"Tanca"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other">Seleccionats: <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="one">Seleccionats: <xliff:g id="COUNT_0">%1$d</xliff:g></item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"-<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Restableix les dades de fàbrica del dispositiu per utilitzar-lo sense restriccions"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Toca per obtenir més informació."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> s\'ha desactivat"</string> </resources> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index 4db961bce4f4..039c2dff3a17 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -567,7 +567,7 @@ <item msgid="2374913952870110618">"Vlastní"</item> </string-array> <string-array name="postalAddressTypes"> - <item msgid="6880257626740047286">"Domov"</item> + <item msgid="6880257626740047286">"Domů"</item> <item msgid="5629153956045109251">"Práce"</item> <item msgid="4966604264500343469">"Ostatní"</item> <item msgid="4932682847595299369">"Vlastní"</item> @@ -624,7 +624,7 @@ <string name="emailTypeOther" msgid="2923008695272639549">"Jiné"</string> <string name="emailTypeMobile" msgid="119919005321166205">"Mobil"</string> <string name="postalTypeCustom" msgid="8903206903060479902">"Vlastní"</string> - <string name="postalTypeHome" msgid="8165756977184483097">"Domov"</string> + <string name="postalTypeHome" msgid="8165756977184483097">"Domů"</string> <string name="postalTypeWork" msgid="5268172772387694495">"Práce"</string> <string name="postalTypeOther" msgid="2726111966623584341">"Jiné"</string> <string name="imTypeCustom" msgid="2074028755527826046">"Vlastní"</string> @@ -921,6 +921,54 @@ <item quantity="other">za <xliff:g id="COUNT_1">%d</xliff:g> let</item> <item quantity="one">za <xliff:g id="COUNT_0">%d</xliff:g> rok</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="few">před <xliff:g id="COUNT_1">%d</xliff:g> minutami</item> + <item quantity="many">před <xliff:g id="COUNT_1">%d</xliff:g> minuty</item> + <item quantity="other">před <xliff:g id="COUNT_1">%d</xliff:g> minutami</item> + <item quantity="one">před <xliff:g id="COUNT_0">%d</xliff:g> minutou</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="few">před <xliff:g id="COUNT_1">%d</xliff:g> hodinami</item> + <item quantity="many">před <xliff:g id="COUNT_1">%d</xliff:g> hodiny</item> + <item quantity="other">před <xliff:g id="COUNT_1">%d</xliff:g> hodinami</item> + <item quantity="one">před <xliff:g id="COUNT_0">%d</xliff:g> hodinou</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="few">před <xliff:g id="COUNT_1">%d</xliff:g> dny</item> + <item quantity="many">před <xliff:g id="COUNT_1">%d</xliff:g> dne</item> + <item quantity="other">před <xliff:g id="COUNT_1">%d</xliff:g> dny</item> + <item quantity="one">před <xliff:g id="COUNT_0">%d</xliff:g> dnem</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="few">před <xliff:g id="COUNT_1">%d</xliff:g> lety</item> + <item quantity="many">před <xliff:g id="COUNT_1">%d</xliff:g> roku</item> + <item quantity="other">před <xliff:g id="COUNT_1">%d</xliff:g> lety</item> + <item quantity="one">před <xliff:g id="COUNT_0">%d</xliff:g> rokem</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="few">za <xliff:g id="COUNT_1">%d</xliff:g> minuty</item> + <item quantity="many">za <xliff:g id="COUNT_1">%d</xliff:g> minuty</item> + <item quantity="other">za <xliff:g id="COUNT_1">%d</xliff:g> minut</item> + <item quantity="one">za <xliff:g id="COUNT_0">%d</xliff:g> minutu</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="few">za <xliff:g id="COUNT_1">%d</xliff:g> hodiny</item> + <item quantity="many">za <xliff:g id="COUNT_1">%d</xliff:g> hodiny</item> + <item quantity="other">za <xliff:g id="COUNT_1">%d</xliff:g> hodin</item> + <item quantity="one">za <xliff:g id="COUNT_0">%d</xliff:g> hodinu</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="few">za <xliff:g id="COUNT_1">%d</xliff:g> dny</item> + <item quantity="many">za <xliff:g id="COUNT_1">%d</xliff:g> dne</item> + <item quantity="other">za <xliff:g id="COUNT_1">%d</xliff:g> dnů</item> + <item quantity="one">za <xliff:g id="COUNT_0">%d</xliff:g> den</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="few">za <xliff:g id="COUNT_1">%d</xliff:g> roky</item> + <item quantity="many">za <xliff:g id="COUNT_1">%d</xliff:g> roku</item> + <item quantity="other">za <xliff:g id="COUNT_1">%d</xliff:g> let</item> + <item quantity="one">za <xliff:g id="COUNT_0">%d</xliff:g> rok</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Potíže s videem"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Toto video nelze přenášet datovým proudem do tohoto zařízení."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Toto video nelze přehrát."</string> @@ -992,8 +1040,7 @@ <string name="aerr_process" msgid="6201597323218674729">"Proces <xliff:g id="PROCESS">%1$s</xliff:g> přestal fungovat"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"Aplikace <xliff:g id="APPLICATION">%1$s</xliff:g> pravidelně přestává fungovat"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"Aplikace <xliff:g id="PROCESS">%1$s</xliff:g> pravidelně přestává fungovat"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Restartovat aplikaci"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Obnovit a restartovat aplikaci"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Znovu spustit aplikaci"</string> <string name="aerr_report" msgid="5371800241488400617">"Odeslat zpětnou vazbu"</string> <string name="aerr_close" msgid="2991640326563991340">"Zavřít"</string> <string name="aerr_mute" msgid="1974781923723235953">"Ignorovat do restartu zařízení"</string> @@ -1550,7 +1597,6 @@ <string name="deleted_key" msgid="7659477886625566590">"Číslice <xliff:g id="KEY">%1$s</xliff:g> byla smazána"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"Pracovní <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Chcete-li tuto obrazovku uvolnit, klepněte na tlačítko Zpět a podržte jej."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Chcete-li tuto obrazovku uvolnit, klepněte na tlačítko Přehled a podržte jej."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Aplikace je připnutá: Odepnutí v tomto zařízení není povoleno."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Obrazovka připnuta"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Obrazovka uvolněna"</string> @@ -1633,6 +1679,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Požadavek SS byl změněn na požadavek USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Požadavek SS byl změněn na nový požadavek SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Pracovní profil"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Tlačítko rozbalení"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"přepnout rozbalení"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Port USB pro periferní zařízení – Android"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"Port USB pro periferní zařízení"</string> @@ -1640,6 +1688,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Zavřít rozbalovací nabídku"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Maximalizovat"</string> <string name="close_button_text" msgid="3937902162644062866">"Zavřít"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> položky</item> <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> položky</item> @@ -1674,4 +1724,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Chcete-li toto zařízení používat bez omezení, obnovte jej do továrního nastavení"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Klepnutím zobrazíte další informace."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> – zakázáno"</string> </resources> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index 4121d237ed1e..f0684e473d71 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -597,10 +597,10 @@ <string name="phoneTypeOther" msgid="1544425847868765990">"Andet"</string> <string name="phoneTypeCallback" msgid="2712175203065678206">"Tilbagekald"</string> <string name="phoneTypeCar" msgid="8738360689616716982">"Bil"</string> - <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Firma (hovednummer)"</string> + <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Firma (hovednr.)"</string> <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string> <string name="phoneTypeMain" msgid="6766137010628326916">"Hovednr."</string> - <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Andet Faxnummer"</string> + <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Andet faxnummer"</string> <string name="phoneTypeRadio" msgid="4093738079908667513">"Radio"</string> <string name="phoneTypeTelex" msgid="3367879952476250512">"Telex"</string> <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY TDD"</string> @@ -891,6 +891,38 @@ <item quantity="one">om <xliff:g id="COUNT_1">%d</xliff:g> år</item> <item quantity="other">om <xliff:g id="COUNT_1">%d</xliff:g> år</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="one">for <xliff:g id="COUNT_1">%d</xliff:g> minut siden</item> + <item quantity="other">for <xliff:g id="COUNT_1">%d</xliff:g> minutter siden</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="one">for <xliff:g id="COUNT_1">%d</xliff:g> time siden</item> + <item quantity="other">for <xliff:g id="COUNT_1">%d</xliff:g> timer siden</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="one">for <xliff:g id="COUNT_1">%d</xliff:g> dag siden</item> + <item quantity="other">for <xliff:g id="COUNT_1">%d</xliff:g> dage siden</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="one">for <xliff:g id="COUNT_1">%d</xliff:g> år siden</item> + <item quantity="other">for <xliff:g id="COUNT_1">%d</xliff:g> år siden</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="one">om <xliff:g id="COUNT_1">%d</xliff:g> minut</item> + <item quantity="other">om <xliff:g id="COUNT_1">%d</xliff:g> minutter</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="one">om <xliff:g id="COUNT_1">%d</xliff:g> time</item> + <item quantity="other">om <xliff:g id="COUNT_1">%d</xliff:g> timer</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="one">om <xliff:g id="COUNT_1">%d</xliff:g> dag</item> + <item quantity="other">om <xliff:g id="COUNT_1">%d</xliff:g> dage</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="one">om <xliff:g id="COUNT_1">%d</xliff:g> år</item> + <item quantity="other">om <xliff:g id="COUNT_1">%d</xliff:g> år</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Videoproblem"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Denne video kan ikke streames på denne enhed."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Videoen kan ikke afspilles."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> er stoppet"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> bliver ved med at stoppe"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> bliver ved med at stoppe"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Genstart appen"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Nulstil og genstart appen"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Åbn appen igen"</string> <string name="aerr_report" msgid="5371800241488400617">"Send feedback"</string> <string name="aerr_close" msgid="2991640326563991340">"Luk"</string> <string name="aerr_mute" msgid="1974781923723235953">"Ignorer, indtil enheden genstarter"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> er slettet"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> – arbejde"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Hvis du vil frigøre dette skærmbillede, skal du trykke på Tilbage og holde fingeren nede."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Hvis du vil frigøre dette skærmbillede, skal du trykke på Oversigt og holde fingeren nede."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Appen er fastgjort: Det er ikke tilladt at frigøre den på denne enhed."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Skærmen blev fastgjort"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Skærmen blev frigjort"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS-anmodningen er ændret til en USSD-anmodning."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS-anmodningen er ændret til en ny SS-anmodning."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Arbejdsprofil"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Udvid-knap"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"Slå udvidelse til eller fra"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"USB-port til eksterne Android-enheder"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB-port til eksterne enheder"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Luk overløb"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Maksimér"</string> <string name="close_button_text" msgid="3937902162644062866">"Luk"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g>valgt</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> valgt</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Gendan fabriksdataene på enheden for at bruge den uden begrænsninger"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Tryk for at få flere oplysninger."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> – deaktiveret"</string> </resources> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index 595f83dbedd0..80439ae196f5 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -891,6 +891,38 @@ <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g> a</item> <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g> a</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other">vor <xliff:g id="COUNT_1">%d</xliff:g> Minuten</item> + <item quantity="one">vor <xliff:g id="COUNT_0">%d</xliff:g> Minute</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other">vor <xliff:g id="COUNT_1">%d</xliff:g> Stunden</item> + <item quantity="one">vor <xliff:g id="COUNT_0">%d</xliff:g> Stunde</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other">vor <xliff:g id="COUNT_1">%d</xliff:g> Tagen</item> + <item quantity="one">vor <xliff:g id="COUNT_0">%d</xliff:g> Tag</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other">vor <xliff:g id="COUNT_1">%d</xliff:g> Jahren</item> + <item quantity="one">vor <xliff:g id="COUNT_0">%d</xliff:g> Jahr</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g> Minuten</item> + <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g> Minute</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g> Stunden</item> + <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g> Stunde</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g> Tagen</item> + <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g> Tag</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g> Jahren</item> + <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g> Jahr</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Videoprobleme"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Dieses Video ist nicht für Streaming auf diesem Gerät gültig."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Video kann nicht wiedergegeben werden."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> wurde beendet"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> wird wiederholt beendet"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> wird wiederholt beendet"</string> - <string name="aerr_restart" msgid="9001379185665886595">"App neu starten"</string> - <string name="aerr_reset" msgid="7645427603514220451">"App zurücksetzen und neu starten"</string> + <string name="aerr_restart" msgid="7581308074153624475">"App wieder öffnen"</string> <string name="aerr_report" msgid="5371800241488400617">"Feedback geben"</string> <string name="aerr_close" msgid="2991640326563991340">"Schließen"</string> <string name="aerr_mute" msgid="1974781923723235953">"Bis zum Neustart des Geräts ausblenden"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> gelöscht"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> (geschäftlich)"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Um die Fixierung dieses Bildschirms aufzuheben, \"Zurück\" berühren und halten."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Um die Fixierung dieses Bildschirms aufzuheben, \"Übersicht\" berühren und halten."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Die App ist fixiert. Das Aufheben der Fixierung ist auf diesem Gerät nicht zulässig."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Bildschirm fixiert"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Bildschirm gelöst"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS-Anfrage wird in USSD-Anfrage geändert."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS-Anfrage wird in neue SS-Anfrage geändert."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Arbeitsprofil"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Schaltfläche \"Maximieren\""</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"Maximierung ein-/auschalten"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"USB-Port für Android-Peripheriegeräte"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB-Port für Peripheriegeräte"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Überlauf schließen"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Maximieren"</string> <string name="close_button_text" msgid="3937902162644062866">"Schließen"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ausgewählt</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ausgewählt</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Gerät auf Werkseinstellungen zurücksetzen, um es ohne Einschränkungen zu nutzen"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Für weitere Informationen tippen."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> deaktiviert"</string> </resources> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index 55c6fa81448b..f2a9017dc5ea 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -600,7 +600,7 @@ <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Κύρια εταιρική"</string> <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string> <string name="phoneTypeMain" msgid="6766137010628326916">"Κύριος"</string> - <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Άλλο fax"</string> + <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Άλλο φαξ"</string> <string name="phoneTypeRadio" msgid="4093738079908667513">"Πομπός"</string> <string name="phoneTypeTelex" msgid="3367879952476250512">"Τέλεξ"</string> <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"Τηλέφωνο TTY/TDD"</string> @@ -891,6 +891,38 @@ <item quantity="other">σε <xliff:g id="COUNT_1">%d</xliff:g> ε.</item> <item quantity="one">σε <xliff:g id="COUNT_0">%d</xliff:g> ε.</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other">πριν από <xliff:g id="COUNT_1">%d</xliff:g> λεπτά</item> + <item quantity="one">πριν από <xliff:g id="COUNT_0">%d</xliff:g> λεπτό</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other">πριν από <xliff:g id="COUNT_1">%d</xliff:g> ώρες</item> + <item quantity="one">πριν από <xliff:g id="COUNT_0">%d</xliff:g> ώρα</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other">πριν από <xliff:g id="COUNT_1">%d</xliff:g> ημέρες</item> + <item quantity="one">πριν από <xliff:g id="COUNT_0">%d</xliff:g> ημέρα</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other">πριν από <xliff:g id="COUNT_1">%d</xliff:g> έτη</item> + <item quantity="one">πριν από <xliff:g id="COUNT_0">%d</xliff:g> έτος</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other">σε <xliff:g id="COUNT_1">%d</xliff:g> λεπτά</item> + <item quantity="one">σε <xliff:g id="COUNT_0">%d</xliff:g> λεπτό</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other">σε <xliff:g id="COUNT_1">%d</xliff:g> ώρες</item> + <item quantity="one">σε <xliff:g id="COUNT_0">%d</xliff:g> ώρα</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other">σε <xliff:g id="COUNT_1">%d</xliff:g> ημέρες</item> + <item quantity="one">σε <xliff:g id="COUNT_0">%d</xliff:g> ημέρα</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other">σε <xliff:g id="COUNT_1">%d</xliff:g> έτη</item> + <item quantity="one">σε <xliff:g id="COUNT_0">%d</xliff:g> έτος</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Πρόβλημα με το βίντεο"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Αυτό το βίντεο δεν είναι έγκυρο για ροή σε αυτή τη συσκευή."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Δεν μπορείτε να αναπαράγετε αυτό το βίντεο."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"Η διαδικασία <xliff:g id="PROCESS">%1$s</xliff:g> έχει διακοπεί"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"Η εφαρμογή <xliff:g id="APPLICATION">%1$s</xliff:g> διακόπτεται επανειλημμένα"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"Η διαδικασία <xliff:g id="PROCESS">%1$s</xliff:g> διακόπτεται επανειλημμένα"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Επανεκκίνηση εφαρμογής"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Επαναφορά και επανεκκίνηση εφαρμογής"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Ανοίξτε ξανά την εφαρμογή"</string> <string name="aerr_report" msgid="5371800241488400617">"Αποστολή σχολίων"</string> <string name="aerr_close" msgid="2991640326563991340">"Κλείσιμο"</string> <string name="aerr_mute" msgid="1974781923723235953">"Σίγαση μέχρι την επανεκκίνηση της συσκευής"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> διαγράφηκε"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"Εργασία <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Για να ξεκαρφιτσώσετε αυτήν την οθόνη, αγγίξτε παρατεταμένα \"Επιστροφή\"."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Για να ξεκαρφιτσώσετε αυτήν την οθόνη, αγγίξτε παρατεταμένα \"Επισκόπηση\"."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Η εφαρμογή καρφιτσώθηκε: Το ξεκαρφίτσωμα δεν επιτρέπεται σε αυτήν τη συσκευή."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Η οθόνη καρφιτσώθηκε"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Η οθόνη ξεκαρφιτσώθηκε"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Το αίτημα SS τροποποιήθηκε σε αίτημα USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Το αίτημα SS τροποποιήθηκε σε νέο αίτημα SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Προφίλ εργασίας"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Κουμπί ανάπτυξης"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"εναλλαγή επέκτασης"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Περιφερειακή θύρα USB Android"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"Περιφερειακή θύρα USB"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Κλείσιμο υπερχείλισης"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Μεγιστοποίηση"</string> <string name="close_button_text" msgid="3937902162644062866">"Κλείσιμο"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other">Επιλέχτηκαν <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="one">Επιλέχτηκε <xliff:g id="COUNT_0">%1$d</xliff:g></item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Επαναφέρετε τις εργοστασιακές ρυθμίσεις για να χρησιμοποιήσετε αυτήν τη συσκευή χωρίς περιορισμούς"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Αγγίξτε για να μάθετε περισσότερα."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Απενεργοποιημένο <xliff:g id="LABEL">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml index d2e413956c59..65d6a8da581a 100644 --- a/core/res/res/values-en-rAU/strings.xml +++ b/core/res/res/values-en-rAU/strings.xml @@ -239,7 +239,7 @@ <string name="notification_hidden_text" msgid="1135169301897151909">"Contents hidden"</string> <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Contents hidden by policy"</string> <string name="safeMode" msgid="2788228061547930246">"Safe mode"</string> - <string name="android_system_label" msgid="6577375335728551336">"Android system"</string> + <string name="android_system_label" msgid="6577375335728551336">"Android System"</string> <string name="user_owner_label" msgid="1119010402169916617">"Switch to Personal"</string> <string name="managed_profile_label" msgid="5289992269827577857">"Switch to Work"</string> <string name="permgrouplab_contacts" msgid="3657758145679177612">"Contacts"</string> @@ -891,6 +891,38 @@ <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g>y</item> <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g>y</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutes</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minute ago</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> hours</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> hour ago</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> days</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> day ago</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> years ago</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> year ago</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g> minutes</item> + <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g> minute</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g> hours</item> + <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g> hour</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g> days</item> + <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g> day</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g> years</item> + <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g> year</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Video problem"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"This video isn\'t valid for streaming to this device."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Can\'t play this video."</string> @@ -939,7 +971,7 @@ <string name="whichViewApplicationLabel" msgid="2666774233008808473">"Open"</string> <string name="whichEditApplication" msgid="144727838241402655">"Edit with"</string> <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Edit with %1$s"</string> - <string name="whichEditApplicationLabel" msgid="7183524181625290300">"(edit)"</string> + <string name="whichEditApplicationLabel" msgid="7183524181625290300">"Edit"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Share with"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Share with %1$s"</string> <string name="whichSendApplicationLabel" msgid="4579076294675975354">"Shared"</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> has stopped"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> keeps stopping"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> keeps stopping"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Restart app"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Reset and restart app"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Open app again"</string> <string name="aerr_report" msgid="5371800241488400617">"Send feedback"</string> <string name="aerr_close" msgid="2991640326563991340">"Close"</string> <string name="aerr_mute" msgid="1974781923723235953">"Mute until device restarts"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> deleted"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"Work <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"To unpin this screen, touch & hold Back."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"To unpin this screen, touch & hold Overview."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"App is pinned: unpinning isn\'t allowed on this device."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Screen pinned"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Screen unpinned"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS request is modified to USSD request."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS request is modified to new SS request."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Work profile"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Expand button"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"toggle expansion"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB Peripheral Port"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB Peripheral Port"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Close overflow"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Maximise"</string> <string name="close_button_text" msgid="3937902162644062866">"Close"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> selected</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> selected</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Factory reset to use this device without restrictions"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Touch to find out more."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Disabled <xliff:g id="LABEL">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index d2e413956c59..65d6a8da581a 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -239,7 +239,7 @@ <string name="notification_hidden_text" msgid="1135169301897151909">"Contents hidden"</string> <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Contents hidden by policy"</string> <string name="safeMode" msgid="2788228061547930246">"Safe mode"</string> - <string name="android_system_label" msgid="6577375335728551336">"Android system"</string> + <string name="android_system_label" msgid="6577375335728551336">"Android System"</string> <string name="user_owner_label" msgid="1119010402169916617">"Switch to Personal"</string> <string name="managed_profile_label" msgid="5289992269827577857">"Switch to Work"</string> <string name="permgrouplab_contacts" msgid="3657758145679177612">"Contacts"</string> @@ -891,6 +891,38 @@ <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g>y</item> <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g>y</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutes</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minute ago</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> hours</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> hour ago</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> days</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> day ago</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> years ago</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> year ago</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g> minutes</item> + <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g> minute</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g> hours</item> + <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g> hour</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g> days</item> + <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g> day</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g> years</item> + <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g> year</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Video problem"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"This video isn\'t valid for streaming to this device."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Can\'t play this video."</string> @@ -939,7 +971,7 @@ <string name="whichViewApplicationLabel" msgid="2666774233008808473">"Open"</string> <string name="whichEditApplication" msgid="144727838241402655">"Edit with"</string> <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Edit with %1$s"</string> - <string name="whichEditApplicationLabel" msgid="7183524181625290300">"(edit)"</string> + <string name="whichEditApplicationLabel" msgid="7183524181625290300">"Edit"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Share with"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Share with %1$s"</string> <string name="whichSendApplicationLabel" msgid="4579076294675975354">"Shared"</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> has stopped"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> keeps stopping"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> keeps stopping"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Restart app"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Reset and restart app"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Open app again"</string> <string name="aerr_report" msgid="5371800241488400617">"Send feedback"</string> <string name="aerr_close" msgid="2991640326563991340">"Close"</string> <string name="aerr_mute" msgid="1974781923723235953">"Mute until device restarts"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> deleted"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"Work <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"To unpin this screen, touch & hold Back."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"To unpin this screen, touch & hold Overview."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"App is pinned: unpinning isn\'t allowed on this device."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Screen pinned"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Screen unpinned"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS request is modified to USSD request."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS request is modified to new SS request."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Work profile"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Expand button"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"toggle expansion"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB Peripheral Port"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB Peripheral Port"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Close overflow"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Maximise"</string> <string name="close_button_text" msgid="3937902162644062866">"Close"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> selected</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> selected</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Factory reset to use this device without restrictions"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Touch to find out more."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Disabled <xliff:g id="LABEL">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml index d2e413956c59..65d6a8da581a 100644 --- a/core/res/res/values-en-rIN/strings.xml +++ b/core/res/res/values-en-rIN/strings.xml @@ -239,7 +239,7 @@ <string name="notification_hidden_text" msgid="1135169301897151909">"Contents hidden"</string> <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Contents hidden by policy"</string> <string name="safeMode" msgid="2788228061547930246">"Safe mode"</string> - <string name="android_system_label" msgid="6577375335728551336">"Android system"</string> + <string name="android_system_label" msgid="6577375335728551336">"Android System"</string> <string name="user_owner_label" msgid="1119010402169916617">"Switch to Personal"</string> <string name="managed_profile_label" msgid="5289992269827577857">"Switch to Work"</string> <string name="permgrouplab_contacts" msgid="3657758145679177612">"Contacts"</string> @@ -891,6 +891,38 @@ <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g>y</item> <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g>y</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutes</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minute ago</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> hours</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> hour ago</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> days</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> day ago</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> years ago</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> year ago</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g> minutes</item> + <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g> minute</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g> hours</item> + <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g> hour</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g> days</item> + <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g> day</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g> years</item> + <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g> year</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Video problem"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"This video isn\'t valid for streaming to this device."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Can\'t play this video."</string> @@ -939,7 +971,7 @@ <string name="whichViewApplicationLabel" msgid="2666774233008808473">"Open"</string> <string name="whichEditApplication" msgid="144727838241402655">"Edit with"</string> <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Edit with %1$s"</string> - <string name="whichEditApplicationLabel" msgid="7183524181625290300">"(edit)"</string> + <string name="whichEditApplicationLabel" msgid="7183524181625290300">"Edit"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Share with"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Share with %1$s"</string> <string name="whichSendApplicationLabel" msgid="4579076294675975354">"Shared"</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> has stopped"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> keeps stopping"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> keeps stopping"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Restart app"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Reset and restart app"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Open app again"</string> <string name="aerr_report" msgid="5371800241488400617">"Send feedback"</string> <string name="aerr_close" msgid="2991640326563991340">"Close"</string> <string name="aerr_mute" msgid="1974781923723235953">"Mute until device restarts"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> deleted"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"Work <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"To unpin this screen, touch & hold Back."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"To unpin this screen, touch & hold Overview."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"App is pinned: unpinning isn\'t allowed on this device."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Screen pinned"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Screen unpinned"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS request is modified to USSD request."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS request is modified to new SS request."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Work profile"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Expand button"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"toggle expansion"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB Peripheral Port"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB Peripheral Port"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Close overflow"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Maximise"</string> <string name="close_button_text" msgid="3937902162644062866">"Close"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> selected</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> selected</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Factory reset to use this device without restrictions"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Touch to find out more."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Disabled <xliff:g id="LABEL">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index f23c3cc66d96..191c0906197e 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -595,9 +595,9 @@ <string name="phoneTypeFaxHome" msgid="2067265972322971467">"Fax personal"</string> <string name="phoneTypePager" msgid="7582359955394921732">"Localizador"</string> <string name="phoneTypeOther" msgid="1544425847868765990">"Otro"</string> - <string name="phoneTypeCallback" msgid="2712175203065678206">"Devolución de llamada"</string> + <string name="phoneTypeCallback" msgid="2712175203065678206">"Devolver llamada"</string> <string name="phoneTypeCar" msgid="8738360689616716982">"Automóvil"</string> - <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Empresa principal"</string> + <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Empresa (principal)"</string> <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string> <string name="phoneTypeMain" msgid="6766137010628326916">"Principal"</string> <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Otro fax"</string> @@ -891,6 +891,38 @@ <item quantity="other">en <xliff:g id="COUNT_1">%d</xliff:g> años</item> <item quantity="one">en <xliff:g id="COUNT_0">%d</xliff:g> año</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other">hace <xliff:g id="COUNT_1">%d</xliff:g> minutos</item> + <item quantity="one">hace <xliff:g id="COUNT_0">%d</xliff:g> minuto</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other">hace <xliff:g id="COUNT_1">%d</xliff:g> horas</item> + <item quantity="one">hace <xliff:g id="COUNT_0">%d</xliff:g> hora</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other">hace <xliff:g id="COUNT_1">%d</xliff:g> días</item> + <item quantity="one">hace <xliff:g id="COUNT_0">%d</xliff:g> día</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other">hace <xliff:g id="COUNT_1">%d</xliff:g> años</item> + <item quantity="one">hace <xliff:g id="COUNT_0">%d</xliff:g> año</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other">en <xliff:g id="COUNT_1">%d</xliff:g> minutos</item> + <item quantity="one">en <xliff:g id="COUNT_0">%d</xliff:g> minuto</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other">en <xliff:g id="COUNT_1">%d</xliff:g> horas</item> + <item quantity="one">en <xliff:g id="COUNT_0">%d</xliff:g> hora</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other">en <xliff:g id="COUNT_1">%d</xliff:g> días</item> + <item quantity="one">en <xliff:g id="COUNT_0">%d</xliff:g> día</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other">en <xliff:g id="COUNT_1">%d</xliff:g> años</item> + <item quantity="one">en <xliff:g id="COUNT_0">%d</xliff:g> año</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Problemas de video"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"No es posible transmitir este video al dispositivo."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"No se puede reproducir el video."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> se detuvo"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> continúa fallando"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> continúa fallando"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Reiniciar app"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Restablecer y reiniciar la app"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Volver a abrir la app"</string> <string name="aerr_report" msgid="5371800241488400617">"Enviar comentarios"</string> <string name="aerr_close" msgid="2991640326563991340">"Cerrar"</string> <string name="aerr_mute" msgid="1974781923723235953">"Silenciar hasta que se reinicie el dispositivo"</string> @@ -1512,12 +1543,11 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> borrado"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> de trabajo"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Para dejar de fijar esta pantalla, mantén presionado Atrás."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Para dejar de fijar esta pantalla, mantén presionado Recientes."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"La aplicación está fijada, no se puede anular la fijación en este dispositivo."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Pantalla fija"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Pantalla no fija"</string> <string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Solicitar PIN para quitar fijación"</string> - <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Solicitar patrón de desbloqueo para quitar fijación"</string> + <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Solicitar desbloqueo para quitar fijación"</string> <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Solicitar contraseña para quitar fijación"</string> <string name="package_installed_device_owner" msgid="8420696545959087545">"Lo instaló el administrador."</string> <string name="package_updated_device_owner" msgid="8856631322440187071">"Actualizado por el administrador"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"La solicitud SS cambió por una solicitud USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"La solicitud SS cambió por una nueva solicitud SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Perfil de trabajo"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Botón Expandir"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"activar o desactivar la expansión"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Puerto USB de periféricos Android"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"Puerto USB de periféricos"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Cerrar la barra de herramientas flotante adicional"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Maximizar"</string> <string name="close_button_text" msgid="3937902162644062866">"Cerrar"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> elementos seleccionados</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> elemento seleccionado</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Restablece la configuración de fábrica para usar este dispositivo sin restricciones"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Toca para obtener más información."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Se inhabilitó <xliff:g id="LABEL">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index fa50f61156c1..7f3d91b2592e 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -505,7 +505,7 @@ <string name="permdesc_accessDrmCertificates" msgid="8073288354426159089">"Permite que una aplicación proporcione y utilice certificados DRM. Las aplicaciones normales no deberían necesitar este permiso."</string> <string name="permlab_handoverStatus" msgid="7820353257219300883">"recibir estado de transferencias de Android Beam"</string> <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Permite que esta aplicación reciba información sobre las transferencias actuales de Android Beam"</string> - <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"eliminar certificados DRM"</string> + <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"quitar certificados DRM"</string> <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Permite a una aplicación eliminar los certificados DRM. Las aplicaciones normales no deberían necesitar este permiso."</string> <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"enlazar con el servicio de mensajería de un operador"</string> <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Permite enlazar con la interfaz de nivel superior del servicio de mensajería de un operador. Las aplicaciones normales no deberían necesitar este permiso."</string> @@ -891,6 +891,38 @@ <item quantity="other">en <xliff:g id="COUNT_1">%d</xliff:g> a</item> <item quantity="one">en <xliff:g id="COUNT_0">%d</xliff:g> a</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other">hace <xliff:g id="COUNT_1">%d</xliff:g> minutos</item> + <item quantity="one">hace <xliff:g id="COUNT_0">%d</xliff:g> minuto</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other">hace <xliff:g id="COUNT_1">%d</xliff:g> horas</item> + <item quantity="one">hace <xliff:g id="COUNT_0">%d</xliff:g> hora</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other">hace <xliff:g id="COUNT_1">%d</xliff:g> días</item> + <item quantity="one">hace <xliff:g id="COUNT_0">%d</xliff:g> día</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other">hace <xliff:g id="COUNT_1">%d</xliff:g> años</item> + <item quantity="one">hace <xliff:g id="COUNT_0">%d</xliff:g> año</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other">en <xliff:g id="COUNT_1">%d</xliff:g> minutos</item> + <item quantity="one">en <xliff:g id="COUNT_0">%d</xliff:g> minuto</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other">en <xliff:g id="COUNT_1">%d</xliff:g> horas</item> + <item quantity="one">en <xliff:g id="COUNT_0">%d</xliff:g> hora</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other">en <xliff:g id="COUNT_1">%d</xliff:g> días</item> + <item quantity="one">en <xliff:g id="COUNT_0">%d</xliff:g> día</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other">en <xliff:g id="COUNT_1">%d</xliff:g> años</item> + <item quantity="one">en <xliff:g id="COUNT_0">%d</xliff:g> año</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Incidencias con el vídeo"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Este vídeo no se puede transmitir al dispositivo."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"No se puede reproducir el vídeo."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"El proceso <xliff:g id="PROCESS">%1$s</xliff:g> ha dejado de funcionar"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> sigue sin funcionar"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> sigue sin funcionar"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Reiniciar aplicación"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Restablecer y reiniciar aplicación"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Volver a abrir la aplicación"</string> <string name="aerr_report" msgid="5371800241488400617">"Enviar sugerencias"</string> <string name="aerr_close" msgid="2991640326563991340">"Cerrar"</string> <string name="aerr_mute" msgid="1974781923723235953">"Silenciar hasta que se reinicie el dispositivo"</string> @@ -1295,7 +1326,7 @@ <string name="data_usage_wifi_limit_snoozed_title" msgid="8743856006384825974">"Límite de datos Wi-Fi superado"</string> <string name="data_usage_limit_snoozed_body" msgid="7035490278298441767">"Límite superado en <xliff:g id="SIZE">%s</xliff:g>"</string> <string name="data_usage_restricted_title" msgid="5965157361036321914">"Conexiones automáticas restringidas"</string> - <string name="data_usage_restricted_body" msgid="469866376337242726">"Toca para eliminar restricción."</string> + <string name="data_usage_restricted_body" msgid="469866376337242726">"Toca para quitar la restricción."</string> <string name="ssl_certificate" msgid="6510040486049237639">"Certificado de seguridad"</string> <string name="ssl_certificate_is_valid" msgid="6825263250774569373">"Este certificado es válido."</string> <string name="issued_to" msgid="454239480274921032">"Emitido para:"</string> @@ -1383,7 +1414,7 @@ <string name="kg_failed_attempts_almost_at_login" product="tv" msgid="4224651132862313471">"Has dibujado el patrón de desbloqueo incorrectamente <xliff:g id="NUMBER_0">%1$d</xliff:g> veces. Si se producen <xliff:g id="NUMBER_1">%2$d</xliff:g> intentos incorrectos más, deberás desbloquear la TV mediante una cuenta de correo electrónico.\n\n Vuelve a intentarlo dentro de <xliff:g id="NUMBER_2">%3$d</xliff:g> segundos."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Has fallado <xliff:g id="NUMBER_0">%1$d</xliff:g> veces al dibujar el patrón de desbloqueo. Si fallas otras <xliff:g id="NUMBER_1">%2$d</xliff:g> veces, deberás usar una cuenta de correo electrónico para desbloquear el teléfono.\n\n Inténtalo de nuevo en <xliff:g id="NUMBER_2">%3$d</xliff:g> segundos."</string> <string name="kg_text_message_separator" product="default" msgid="4160700433287233771">" — "</string> - <string name="kg_reordering_delete_drop_target_text" msgid="7899202978204438708">"Eliminar"</string> + <string name="kg_reordering_delete_drop_target_text" msgid="7899202978204438708">"Quitar"</string> <string name="safe_media_volume_warning" product="default" msgid="2276318909314492312">"¿Quieres subir el volumen por encima del nivel recomendado?\n\nEscuchar sonidos a alto volumen durante largos períodos de tiempo puede dañar tus oídos."</string> <string name="continue_to_enable_accessibility" msgid="1626427372316070258">"Mantén la pantalla pulsada con dos dedos para habilitar las funciones de accesibilidad."</string> <string name="accessibility_enabled" msgid="1381972048564547685">"Accesibilidad habilitada"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> eliminado"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> de trabajo"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Mantén pulsado el botón Atrás para dejar de fijar esta pantalla."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Mantén pulsado el botón Visión general para dejar de fijar esta pantalla."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"La aplicación está fijada: no se puede deshacer la fijación en este dispositivo."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Pantalla fijada"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"La pantalla ya no está fija"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"La solicitud SS se ha modificado para la solicitud USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"La solicitud SS se ha modificado para la nueva solicitud SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Perfil de trabajo"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Botón Mostrar"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"alternar mostrar y ocultar"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Puerto periférico USB (Android)"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"Puerto periférico USB"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Cerrar menú adicional"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Maximizar"</string> <string name="close_button_text" msgid="3937902162644062866">"Cerrar"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> seleccionados</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> seleccionado</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Restablece los datos de fábrica para usar este dispositivo sin restricciones"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Toca para obtener más información."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> inhabilitado"</string> </resources> diff --git a/core/res/res/values-et-rEE/strings.xml b/core/res/res/values-et-rEE/strings.xml index c34ad91d374c..f909a952ee80 100644 --- a/core/res/res/values-et-rEE/strings.xml +++ b/core/res/res/values-et-rEE/strings.xml @@ -891,6 +891,38 @@ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> a pärast</item> <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> a pärast</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutit tagasi</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minut tagasi</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tundi tagasi</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> tund tagasi</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> päeva tagasi</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> päev tagasi</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> aastat tagasi</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> aasta tagasi</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minuti pärast</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minuti pärast</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tunni pärast</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> tunni pärast</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> päeva pärast</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> päeva pärast</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> aasta pärast</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> aasta pärast</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Probleem videoga"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"See video ei sobi voogesituseks selles seadmes."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Videot ei saa esitada."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"Rakendus <xliff:g id="PROCESS">%1$s</xliff:g> on seiskunud"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"Rakendus <xliff:g id="APPLICATION">%1$s</xliff:g> lõpetab pidevalt töö"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"Rakendus <xliff:g id="PROCESS">%1$s</xliff:g> lõpetab pidevalt töö"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Taaskäivita rakendus"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Lähtesta ja taaskäivita rakendus"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Ava rakendus uuesti"</string> <string name="aerr_report" msgid="5371800241488400617">"Saada tagasiside"</string> <string name="aerr_close" msgid="2991640326563991340">"Sule"</string> <string name="aerr_mute" msgid="1974781923723235953">"Vaigista, kuni seade taaskäivitatakse"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> on kustutatud"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"Töö <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Ekraani vabastamiseks puudutage pikalt nuppu Tagasi."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Ekraani vabastamiseks puudutage pikalt nuppu Ülevaade."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Rakendus on kinnitatud: vabastamine pole selles seadmes lubatud."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Ekraan on kinnitatud"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Ekraan on vabastatud"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS-päring muudeti USSD-päringuks."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS-päring muudeti uueks SS-päringuks."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Tööprofiil"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Laiendamisnupp"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"vaheta laiendamist"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Androidi väline USB-port"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"Väline USB-port"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Ületäite sulgemine"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Maksimeeri"</string> <string name="close_button_text" msgid="3937902162644062866">"Sule"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> on valitud</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> on valitud</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Seadme piiranguteta kasutamiseks lähtestage see tehaseandmetele"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Lisateabe saamiseks puudutage."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Keelatud <xliff:g id="LABEL">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-eu-rES/strings.xml b/core/res/res/values-eu-rES/strings.xml index 2b88997178dd..f6a00926977b 100644 --- a/core/res/res/values-eu-rES/strings.xml +++ b/core/res/res/values-eu-rES/strings.xml @@ -595,7 +595,7 @@ <string name="phoneTypeFaxHome" msgid="2067265972322971467">"Etxeko faxa"</string> <string name="phoneTypePager" msgid="7582359955394921732">"Bilagailua"</string> <string name="phoneTypeOther" msgid="1544425847868765990">"Bestelakoa"</string> - <string name="phoneTypeCallback" msgid="2712175203065678206">"Dei bidezko erantzuna"</string> + <string name="phoneTypeCallback" msgid="2712175203065678206">"Dei-erantzuna"</string> <string name="phoneTypeCar" msgid="8738360689616716982">"Autoa"</string> <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Laneko nagusia"</string> <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string> @@ -891,6 +891,38 @@ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> urte barru</item> <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> urte barru</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other">Duela <xliff:g id="COUNT_1">%d</xliff:g> minutu</item> + <item quantity="one">Duela minutu <xliff:g id="COUNT_0">%d</xliff:g></item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other">Duela <xliff:g id="COUNT_1">%d</xliff:g> ordu</item> + <item quantity="one">Duela ordu <xliff:g id="COUNT_0">%d</xliff:g></item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other">Duela <xliff:g id="COUNT_1">%d</xliff:g> egun</item> + <item quantity="one">Duela egun <xliff:g id="COUNT_0">%d</xliff:g></item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other">Duela <xliff:g id="COUNT_1">%d</xliff:g> urte</item> + <item quantity="one">Duela urte <xliff:g id="COUNT_0">%d</xliff:g></item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutu barru</item> + <item quantity="one">Minutu <xliff:g id="COUNT_0">%d</xliff:g> barru</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ordu barru</item> + <item quantity="one">Ordu <xliff:g id="COUNT_0">%d</xliff:g> barru</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> egun barru</item> + <item quantity="one">Egun <xliff:g id="COUNT_0">%d</xliff:g> barru</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> urte barru</item> + <item quantity="one">Urte <xliff:g id="COUNT_0">%d</xliff:g> barru</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Bideoak arazoren bat du"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Bideo hau ezin da gailuan zuzenean erreproduzitu."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Ezin da bideoa erreproduzitu."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"Gelditu egin da <xliff:g id="PROCESS">%1$s</xliff:g>"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"Behin eta berriz gelditzen ari da <xliff:g id="APPLICATION">%1$s</xliff:g>"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"Behin eta berriz gelditzen ari da <xliff:g id="PROCESS">%1$s</xliff:g>"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Berrabiarazi aplikazioa"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Berrezarri eta berrabiarazi aplikazioa"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Ireki aplikazioa berriro"</string> <string name="aerr_report" msgid="5371800241488400617">"Bidali iritzia"</string> <string name="aerr_close" msgid="2991640326563991340">"Itxi"</string> <string name="aerr_mute" msgid="1974781923723235953">"Ezkutatu gailua berrabiarazi arte"</string> @@ -1515,7 +1546,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> ezabatu da"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"Laneko <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Pantailari aingura kentzeko, eduki sakatuta Atzera botoia."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Pantailari aingura kentzeko, eduki sakatuta Ikuspegi orokorra botoia."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Aplikazioa ainguratuta dago. Gailu honetan ezin da aingura kendu."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Pantaila ainguratu da"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Aingura kendu zaio pantailari"</string> @@ -1526,7 +1556,7 @@ <string name="package_updated_device_owner" msgid="8856631322440187071">"Administratzaileak eguneratu du"</string> <string name="package_deleted_device_owner" msgid="7650577387493101353">"Administratzaileak ezabatu du"</string> <string name="battery_saver_description" msgid="1960431123816253034">"Bateriak gehiago iraun dezan, bateria-aurrezleak gailuaren funtzionamendua, dardara, kokapen-zerbitzuak eta atzeko planoko datuen erabilera gehiena mugatzen ditu. Posta elektronikoa, mezuak eta sinkronizatzen diren gainerako zerbitzuak ez dira eguneratuko ireki ezean.\n\nGailua kargatzen ezarri orduko desaktibatzen da bateria-aurrezlea."</string> - <string name="data_saver_description" msgid="6015391409098303235">"Datuen erabilera murrizteko, atzeko planoan datuak bidaltzea eta jasotzea galarazten die datu-aurrezleak aplikazio batzuei. Unean erabiltzen ari zaren aplikazioak atzi ditzake datuak, baina baliteke maiztasun txikiagoarekin atzitzea. Horrela, adibidez, baliteke irudiak ez erakustea haiek sakatu arte."</string> + <string name="data_saver_description" msgid="6015391409098303235">"Datu-erabilera murrizteko, atzeko planoan datuak bidaltzea eta jasotzea galarazten die datu-aurrezleak aplikazio batzuei. Unean erabiltzen ari zaren aplikazioak atzi ditzake datuak, baina baliteke maiztasun txikiagoarekin atzitzea. Horrela, adibidez, baliteke irudiak ez erakustea haiek sakatu arte."</string> <string name="data_saver_enable_title" msgid="4674073932722787417">"Datu-aurrezlea aktibatu?"</string> <string name="data_saver_enable_button" msgid="7147735965247211818">"Aktibatu"</string> <plurals name="zen_mode_duration_minutes_summary" formatted="false" msgid="4367877408072000848"> @@ -1582,6 +1612,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS eskaera USSD eskaerara aldatu da."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS eskaera SS eskaera berrira aldatu da."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Work profila"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Zabaltzeko botoia"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"zabaldu edo tolestu"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB ataka periferikoa"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB ataka periferikoa"</string> @@ -1589,6 +1621,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Itxi gainfluxua"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Maximizatu"</string> <string name="close_button_text" msgid="3937902162644062866">"Itxi"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> hautatuta</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> hautatuta</item> @@ -1621,4 +1655,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Berrezarri jatorrizko ezarpenak gailua murriztapenik gabe erabili ahal izateko"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Sakatu informazio gehiago lortzeko."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> desgaituta dago"</string> </resources> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index 2434c34dd53e..191d1212c215 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -148,7 +148,7 @@ <string name="httpError" msgid="7956392511146698522">"خطایی در شبکه وجود داشت."</string> <string name="httpErrorLookup" msgid="4711687456111963163">"URL پیدا نشد."</string> <string name="httpErrorUnsupportedAuthScheme" msgid="6299980280442076799">"طرح کلی احراز هویت سایت پشتیبانی نمیشود."</string> - <string name="httpErrorAuth" msgid="1435065629438044534">"تأیید اعتبار ناموفق بود."</string> + <string name="httpErrorAuth" msgid="1435065629438044534">"راستیآزمایی ناموفق بود."</string> <string name="httpErrorProxyAuth" msgid="1788207010559081331">"احراز هویت از طریق سرور پروکسی انجام نشد."</string> <string name="httpErrorConnect" msgid="8714273236364640549">"اتصال به سرور انجام نشد."</string> <string name="httpErrorIO" msgid="2340558197489302188">"برقراری ارتباط با سرور ممکن نبود. بعداً دوباره امتحان کنید."</string> @@ -216,7 +216,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"خاموش کردن"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"گزارش اشکال"</string> <string name="bugreport_title" msgid="2667494803742548533">"گرفتن گزارش اشکال"</string> - <string name="bugreport_message" msgid="398447048750350456">"این گزارش اطلاعات مربوط به وضعیت دستگاه کنونی شما را جمعآوری میکند تا به صورت یک پیام ایمیل ارسال شود. از زمان شروع گزارش اشکال تا آماده شدن برای ارسال اندکی زمان میبرد؛ لطفاً شکیبا باشید."</string> + <string name="bugreport_message" msgid="398447048750350456">"این گزارش اطلاعات مربوط به وضعیت دستگاه کنونی شما را جمعآوری میکند تا به صورت یک پیام رایانامه ارسال شود. از زمان شروع گزارش اشکال تا آماده شدن برای ارسال اندکی زمان میبرد؛ لطفاً شکیبا باشید."</string> <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"گزارش تعاملی"</string> <string name="bugreport_option_interactive_summary" msgid="229299488536107968">"در بیشتر شرایط از این گزینه استفاده کنید. به شما امکان ردیابی پیشرفت گزارش و وارد کردن جزئیات بیشتری درباره مشکل را میدهد. ممکن است برخی از بخشهایی را که کمتر استفاده شده و باعث افزایش طول زمان گزارش میشود حذف کند."</string> <string name="bugreport_option_full_title" msgid="6354382025840076439">"گزارش کامل"</string> @@ -350,7 +350,7 @@ <string name="permdesc_readCalendar" product="tablet" msgid="4216462049057658723">"به برنامه امکان میدهد همه رویدادهای تقویم ذخیره شده در رایانهٔ لوحی شما را بخواند، از جمله رویدادهای دوستان یا همکاران. این ممکن است به برنامه امکان دهد دادههای تقویم شما را صرفنظر از محرمانه یا حساس بودن آنها به اشتراک گذاشته یا ذخیره کند."</string> <string name="permdesc_readCalendar" product="tv" msgid="3191352452242394196">"به برنامه اجازه میدهد تا همه رویدادهای تقویم ذخیرهشده روی تلویزیون از جمله رویدادهای دوستان یا همکاران را بخواند. شاید به برنامه اجازه دهد تا اطلاعات تقویم را صرفنظر از محرمانه بودن یا حساسیت، به اشتراک بگذارد یا ذخیره کند."</string> <string name="permdesc_readCalendar" product="default" msgid="7434548682470851583">"به برنامه امکان میدهد همه رویدادهای تقویم ذخیره شده در تلفن شما را بخواند، از جمله رویدادهای دوستان یا همکاران. این ممکن است به برنامه امکان دهد دادههای تقویم شما را صرفنظر از محرمانه یا حساس بودن آنها به اشتراک گذاشته یا ذخیره کند."</string> - <string name="permlab_writeCalendar" msgid="8438874755193825647">"افزودن یا تغییر رویدادهای تقویم و ارسال ایمیل به مهمانان بدون دخالت مالک"</string> + <string name="permlab_writeCalendar" msgid="8438874755193825647">"افزودن یا تغییر رویدادهای تقویم و ارسال رایانامه به مهمانان بدون دخالت مالک"</string> <string name="permdesc_writeCalendar" product="tablet" msgid="6679035520113668528">"به برنامه اجازه میدهد رویدادهایی را که میتوانید در رایانهٔ لوحی خود اصلاح نمایید، از جمله رویدادهای دوستان یا همکاران خود را، اضافه یا حذف کرده یا تغییر دهد. این ویژگی ممکن است به برنامه اجازه دهد پیامهایی را که به نظر میرسد از مالکین تقویم رسیده است ارسال نموده یا رویدادها را بدون اطلاع مالک اصلاح کنند."</string> <string name="permdesc_writeCalendar" product="tv" msgid="1273290605500902507">"به برنامه اجازه میدهد به افزودن، حذف یا تغییر رویدادهایی بپردازد که میتوانید در تلویزیونتان تغییر دهید، از جمله رویدادهای دوستان یا همکاران خود. این ویژگی شاید به برنامه اجازه دهد پیامهایی را ارسال کند که به نظر میرسد از جانب مالکین تقویم است یا رویدادها را بدون اطلاع مالک تغییر دهد."</string> <string name="permdesc_writeCalendar" product="default" msgid="2324469496327249376">"به برنامه اجازه میدهد رویدادهایی را که میتوانید در تلفن خود اصلاح نمایید، از جمله رویدادهای دوستان یا همکاران خود را، اضافه یا حذف کرده یا تغییر دهد. این ویژگی ممکن است به برنامه اجازه دهد پیامهایی را که به نظر میرسد از مالکین تقویم رسیده است ارسال نموده یا رویدادها را بدون اطلاع مالک اصلاح کنند."</string> @@ -717,7 +717,7 @@ <string name="lockscreen_glogin_forgot_pattern" msgid="2588521501166032747">"بازگشایی قفل حساب"</string> <string name="lockscreen_glogin_too_many_attempts" msgid="2751368605287288808">"تلاشهای زیادی برای کشیدن الگو صورت گرفته است"</string> <string name="lockscreen_glogin_instructions" msgid="3931816256100707784">"برای بازگشایی قفل، با حساب Google خود وارد سیستم شوید."</string> - <string name="lockscreen_glogin_username_hint" msgid="8846881424106484447">"نام کاربری (ایمیل)"</string> + <string name="lockscreen_glogin_username_hint" msgid="8846881424106484447">"نام کاربری (رایانامه)"</string> <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"گذرواژه"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"ورود به سیستم"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"نام کاربر یا گذرواژه نامعتبر است."</string> @@ -891,6 +891,38 @@ <item quantity="one">در <xliff:g id="COUNT_1">%d</xliff:g> سال</item> <item quantity="other">در <xliff:g id="COUNT_1">%d</xliff:g> سال</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> دقیقه پیش</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> دقیقه پیش</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ساعت پیش</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ساعت پیش</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> روز پیش</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> روز پیش</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> سال پیش</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> سال پیش</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="one">در <xliff:g id="COUNT_1">%d</xliff:g> دقیقه</item> + <item quantity="other">در <xliff:g id="COUNT_1">%d</xliff:g> دقیقه</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="one">در <xliff:g id="COUNT_1">%d</xliff:g> ساعت</item> + <item quantity="other">در <xliff:g id="COUNT_1">%d</xliff:g> ساعت</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="one">در <xliff:g id="COUNT_1">%d</xliff:g> روز</item> + <item quantity="other">در <xliff:g id="COUNT_1">%d</xliff:g> روز</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="one">در <xliff:g id="COUNT_1">%d</xliff:g> سال</item> + <item quantity="other">در <xliff:g id="COUNT_1">%d</xliff:g> سال</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"مشکل در ویدیو"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"متأسفیم، این ویدیو برای پخش جریانی با این دستگاه معتبر نیست."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"پخش این ویدیو ممکن نیست."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> متوقف شده است"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> مرتب متوقف میشود"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> مرتب متوقف میشود"</string> - <string name="aerr_restart" msgid="9001379185665886595">"راهاندازی مجدد برنامه"</string> - <string name="aerr_reset" msgid="7645427603514220451">"بازنشانی و راهاندازی مجدد برنامه"</string> + <string name="aerr_restart" msgid="7581308074153624475">"باز کردن دوباره برنامه"</string> <string name="aerr_report" msgid="5371800241488400617">"ارسال بازخورد"</string> <string name="aerr_close" msgid="2991640326563991340">"بستن"</string> <string name="aerr_mute" msgid="1974781923723235953">"صامت کردن تا وقتی دستگاه راهاندازی مجدد شود"</string> @@ -1364,7 +1395,7 @@ <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"پین کدها منطبق نیستند"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"تلاشهای زیادی برای کشیدن الگو صورت گرفته است"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"برای بازگشایی قفل، با حساب Google خود وارد سیستم شوید."</string> - <string name="kg_login_username_hint" msgid="5718534272070920364">"نام کاربری (ایمیل)"</string> + <string name="kg_login_username_hint" msgid="5718534272070920364">"نام کاربری (رایانامه)"</string> <string name="kg_login_password_hint" msgid="9057289103827298549">"گذرواژه"</string> <string name="kg_login_submit_button" msgid="5355904582674054702">"ورود به سیستم"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"نام کاربری یا گذرواژه نامعتبر."</string> @@ -1379,9 +1410,9 @@ <string name="kg_failed_attempts_now_wiping" product="tablet" msgid="2072996269148483637">"شما به اشتباه <xliff:g id="NUMBER">%d</xliff:g> بار اقدام به باز کردن قفل رایانه لوحی کردهاید. رایانه لوحی اکنون به پیشفرض کارخانه بازنشانی میشود."</string> <string name="kg_failed_attempts_now_wiping" product="tv" msgid="4987878286750741463">"<xliff:g id="NUMBER">%d</xliff:g> دفعه به صورت نادرست سعی کردهاید قفل تلویزیون را باز کنید. اکنون تلویزیون به تنظیمات پیشفرض کارخانه بازنشانی خواهد شد."</string> <string name="kg_failed_attempts_now_wiping" product="default" msgid="4817627474419471518">"شما به اشتباه <xliff:g id="NUMBER">%d</xliff:g> بار اقدام به باز کردن قفل تلفن کردهاید. این تلفن اکنون به پیشفرض کارخانه بازنشانی میشود."</string> - <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"شما الگوی بازگشایی قفل خود را <xliff:g id="NUMBER_0">%1$d</xliff:g> بار اشتباه کشیدهاید. بعد از <xliff:g id="NUMBER_1">%2$d</xliff:g> تلاش ناموفق، از شما خواسته میشود که با استفاده از یک حساب ایمیل قفل رایانه لوحی خود را باز کنید.\n\n لطفاً پس از <xliff:g id="NUMBER_2">%3$d</xliff:g> ثانیه دوباره امتحان کنید."</string> - <string name="kg_failed_attempts_almost_at_login" product="tv" msgid="4224651132862313471">"الگوی بازگشاییتان را <xliff:g id="NUMBER_0">%1$d</xliff:g> دفعه به صورت نادرست رسم کردهاید. <xliff:g id="NUMBER_1">%2$d</xliff:g> پس از \n تلاش ناموفق دیگر، از شما خواسته میشود تا با استفاده از یک حساب ایمیل، قفل تلویزیونتان را باز کنید.\n پس از <xliff:g id="NUMBER_2">%3$d</xliff:g> ثانیه دوباره امتحان کنید."</string> - <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"شما الگوی بازگشایی قفل خود را <xliff:g id="NUMBER_0">%1$d</xliff:g> بار اشتباه کشیدهاید. پس از <xliff:g id="NUMBER_1">%2$d</xliff:g> تلاش ناموفق، از شما خواسته میشود که با استفاده از یک حساب ایمیل قفل تلفن خود را باز کنید.\n\n لطفاً پس از <xliff:g id="NUMBER_2">%3$d</xliff:g> ثانیه دوباره امتحان کنید."</string> + <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"شما الگوی بازگشایی قفل خود را <xliff:g id="NUMBER_0">%1$d</xliff:g> بار اشتباه کشیدهاید. بعد از <xliff:g id="NUMBER_1">%2$d</xliff:g> تلاش ناموفق، از شما خواسته میشود که با استفاده از یک حساب رایانامه قفل رایانه لوحی خود را باز کنید.\n\n لطفاً پس از <xliff:g id="NUMBER_2">%3$d</xliff:g> ثانیه دوباره امتحان کنید."</string> + <string name="kg_failed_attempts_almost_at_login" product="tv" msgid="4224651132862313471">"الگوی بازگشاییتان را <xliff:g id="NUMBER_0">%1$d</xliff:g> دفعه به صورت نادرست رسم کردهاید. <xliff:g id="NUMBER_1">%2$d</xliff:g> پس از \n تلاش ناموفق دیگر، از شما خواسته میشود تا با استفاده از یک حساب رایانامه، قفل تلویزیونتان را باز کنید.\n پس از <xliff:g id="NUMBER_2">%3$d</xliff:g> ثانیه دوباره امتحان کنید."</string> + <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"شما الگوی بازگشایی قفل خود را <xliff:g id="NUMBER_0">%1$d</xliff:g> بار اشتباه کشیدهاید. پس از <xliff:g id="NUMBER_1">%2$d</xliff:g> تلاش ناموفق، از شما خواسته میشود که با استفاده از یک حساب رایانامه قفل تلفن خود را باز کنید.\n\n لطفاً پس از <xliff:g id="NUMBER_2">%3$d</xliff:g> ثانیه دوباره امتحان کنید."</string> <string name="kg_text_message_separator" product="default" msgid="4160700433287233771">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="7899202978204438708">"حذف"</string> <string name="safe_media_volume_warning" product="default" msgid="2276318909314492312">"میزان صدا را به بالاتر از حد توصیه شده افزایش میدهید؟\n\nگوش دادن به صداهای بلند برای مدت طولانی میتواند به شنواییتان آسیب وارد کند."</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> حذف شد"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> محل کار"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"برای برداشتن پین این صفحه، «برگشت» را لمس کنید و نگه دارید."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"برای برداشتن پین این صفحه، «نمای کلی» را لمس کنید و نگه دارید."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"برنامه پین شده است: برداشتن پین در این دستگاه مجاز نیست."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"صفحه پین شد"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"پین صفحه برداشته شد"</string> @@ -1522,7 +1552,7 @@ <string name="package_installed_device_owner" msgid="8420696545959087545">"توسط سرپرستتان نصب شد"</string> <string name="package_updated_device_owner" msgid="8856631322440187071">"توسط سرپرست شما بهروزرسانی شد"</string> <string name="package_deleted_device_owner" msgid="7650577387493101353">"توسط سرپرستتان حذف شد"</string> - <string name="battery_saver_description" msgid="1960431123816253034">"برای کمک به بهبود عمر باتری، بهینهسازی باتری عملکرد دستگاهتان را کاهش میدهد و لرزش، سرویسهای مبتنی بر مکان، و دسترسی به اکثر دادهها در پسزمینه را محدود میکند. ایمیل، پیامرسانی و برنامههای دیگری که به همگامسازی وابستهاند، تا زمانیکه آنها را باز نکنید نمیتوانند بهروز شوند.\n\nبهینهسازی باتری بهصورت خودکار در هنگام شارژ شدن دستگاه خاموش میشود."</string> + <string name="battery_saver_description" msgid="1960431123816253034">"برای کمک به بهبود عمر باتری، بهینهسازی باتری عملکرد دستگاهتان را کاهش میدهد و لرزش، سرویسهای مبتنی بر مکان، و دسترسی به اکثر دادهها در پسزمینه را محدود میکند. رایانامه، پیامرسانی و برنامههای دیگری که به همگامسازی وابستهاند، تا زمانیکه آنها را باز نکنید نمیتوانند بهروز شوند.\n\nبهینهسازی باتری بهصورت خودکار در هنگام شارژ شدن دستگاه خاموش میشود."</string> <string name="data_saver_description" msgid="6015391409098303235">"برای کمک به کاهش مصرف داده، «صرفهجویی داده» از ارسال و دریافت داده در پسزمینه از طرف بعضی برنامهها جلوگیری میکند. برنامهای که درحالحاضر استفاده میکنید میتواند به دادهها دسترسی داشته باشد اما دفعات دسترسی آن محدود است.این یعنی، برای مثال، تصاویر تا زمانی که روی آنها ضربه نزنید نشان داده نمیشوند."</string> <string name="data_saver_enable_title" msgid="4674073932722787417">"صرفهجویی داده روشن شود؟"</string> <string name="data_saver_enable_button" msgid="7147735965247211818">"روشن کردن"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"درخواست SS به درخواست USSD اصلاح میشود."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"درخواست SS به درخواست SS جدید اصلاح میشود."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"نمایه کاری"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"دکمه بزرگ کردن"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"روشن/خاموش کردن بزرگنمایی"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"درگاه جانبی Android USB"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"درگاه جانبی USB"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"بستن منوی سرریز"</string> <string name="maximize_button_text" msgid="7543285286182446254">"بزرگ کردن"</string> <string name="close_button_text" msgid="3937902162644062866">"بستن"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> انتخاب شد</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> انتخاب شد</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"برای استفاده بدون محدودیت از این دستگاه، بازنشانی کارخانهای انجام دهید"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"برای یادگیری بیشتر لمس کنید."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> غیرفعال شد"</string> </resources> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index 24f40987fef5..051dce1880e6 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -891,6 +891,38 @@ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> v:n päästä</item> <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> v:n päästä</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minuuttia sitten</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minuutti sitten</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tuntia sitten</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> tunti sitten</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> päivää sitten</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> päivä sitten</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> vuotta sitten</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> vuosi sitten</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minuutin kuluttua</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minuutin kuluttua</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tunnin kuluttua</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> tunnin kuluttua</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> päivän kuluttua</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> päivän kuluttua</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> vuoden kuluttua</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> vuoden kuluttua</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Video-ongelma"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Tätä videota ei voi suoratoistaa tällä laitteella."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Videota ei voida toistaa."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> pysähtyi."</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> pysähtyy toistuvasti."</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> pysähtyy toistuvasti."</string> - <string name="aerr_restart" msgid="9001379185665886595">"Käynnistä sovellus uudelleen"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Nollaa sovellus ja käynnistä uudelleen"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Avaa sovellus uudelleen"</string> <string name="aerr_report" msgid="5371800241488400617">"Lähetä palautetta"</string> <string name="aerr_close" msgid="2991640326563991340">"Sulje"</string> <string name="aerr_mute" msgid="1974781923723235953">"Mykistä laitteen uudelleenkäynnistykseen asti"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> poistettiin"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> (työ)"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Irrota näyttö koskettamalla Takaisin-painiketta pitkään."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Poista näytön kiinnitys koskettamalla Yleistä-kohtaa pitkään."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Sovellus on kiinnitetty. Irrottaminen ei ole sallittua tällä laitteella."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Näyttö kiinnitetty"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Näyttö irrotettu"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS-pyyntö muutettiin USSD-pyynnöksi."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS-pyyntö muutettiin uudeksi SS-pyynnöksi."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Työprofiili"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Laajennuspainike"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"Laajenna/tiivistä painikkeella"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Androidin USB-oheislaiteportti"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB-oheislaiteportti"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Sulje ylivuoto"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Suurenna"</string> <string name="close_button_text" msgid="3937902162644062866">"Sulje"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> valittu</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> valittu</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Palauta tehdasasetukset, jotta voit käyttää tätä laitetta rajoituksitta"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Lue lisätietoja koskettamalla."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> ei ole käytössä."</string> </resources> diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml index 6ecd0fc27aec..d3798128d74f 100644 --- a/core/res/res/values-fr-rCA/strings.xml +++ b/core/res/res/values-fr-rCA/strings.xml @@ -603,9 +603,9 @@ <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Autre télécopieur"</string> <string name="phoneTypeRadio" msgid="4093738079908667513">"Satellite"</string> <string name="phoneTypeTelex" msgid="3367879952476250512">"Télex"</string> - <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY/ATS (malentendants)"</string> - <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Cellulaire professionnel"</string> - <string name="phoneTypeWorkPager" msgid="649938731231157056">"Téléavertisseur professionnel"</string> + <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY/ATS"</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Cellulaire travail"</string> + <string name="phoneTypeWorkPager" msgid="649938731231157056">"Téléavert. travail"</string> <string name="phoneTypeAssistant" msgid="5596772636128562884">"Assistant"</string> <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string> <string name="eventTypeCustom" msgid="7837586198458073404">"Personnaliser"</string> @@ -891,6 +891,38 @@ <item quantity="one">dans <xliff:g id="COUNT_1">%d</xliff:g> a</item> <item quantity="other">dans <xliff:g id="COUNT_1">%d</xliff:g> a</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="one">il y a <xliff:g id="COUNT_1">%d</xliff:g> minute</item> + <item quantity="other">il y a <xliff:g id="COUNT_1">%d</xliff:g> minutes</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="one">il y a<xliff:g id="COUNT_1">%d</xliff:g> heure</item> + <item quantity="other">il y a<xliff:g id="COUNT_1">%d</xliff:g> heures</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="one">il y a <xliff:g id="COUNT_1">%d</xliff:g> jour</item> + <item quantity="other">il y a <xliff:g id="COUNT_1">%d</xliff:g> jours</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="one">il y a <xliff:g id="COUNT_1">%d</xliff:g> an</item> + <item quantity="other">il y a <xliff:g id="COUNT_1">%d</xliff:g> ans</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="one">dans <xliff:g id="COUNT_1">%d</xliff:g> minute</item> + <item quantity="other">dans <xliff:g id="COUNT_1">%d</xliff:g> minutes</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="one">dans <xliff:g id="COUNT_1">%d</xliff:g> heure</item> + <item quantity="other">dans <xliff:g id="COUNT_1">%d</xliff:g> heures</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="one">dans <xliff:g id="COUNT_1">%d</xliff:g> jour</item> + <item quantity="other">dans <xliff:g id="COUNT_1">%d</xliff:g> jours</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="one">dans <xliff:g id="COUNT_1">%d</xliff:g> ans</item> + <item quantity="other">dans <xliff:g id="COUNT_1">%d</xliff:g> ans</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Problème vidéo"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Impossible de lire cette vidéo en continu sur cet appareil."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Impossible de lire la vidéo."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> a cessé de fonctionner"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> plante continuellement"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> plante continuellement"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Redémarrer l\'application"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Réinitialiser et redémarrer l\'application"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Rouvrir l\'application"</string> <string name="aerr_report" msgid="5371800241488400617">"Envoyer des commentaires"</string> <string name="aerr_close" msgid="2991640326563991340">"Fermer"</string> <string name="aerr_mute" msgid="1974781923723235953">"Désactiver jusqu\'au redémarrage de l\'appareil"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"« <xliff:g id="KEY">%1$s</xliff:g> » a été supprimé"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> (travail)"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Pour annuler l\'épinglage de cet écran, maintenez enfoncée la touche Retour."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Pour annuler l\'épinglage de cet écran, maintenez enfoncée la touche Aperçu."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"L\'application est épinglée : l\'annulation de l\'épinglage n\'est pas autorisée sur cet appareil."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Écran épinglé"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Épinglage d\'écran annulé"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"La demande SS a été modifiée et est maintenant une demande USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"La demande SS a été modifiée et est maintenant une nouvelle demande SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Profil professionnel"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Bouton Développer"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"basculer le développement"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Port USB de l\'appareil Android"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"Port USB"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Fermer la barre d\'outils en superposition"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Agrandir"</string> <string name="close_button_text" msgid="3937902162644062866">"Fermer"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> élément sélectionné</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> éléments sélectionnés</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Rétablissez la configuration d\'usine de cet appareil pour l\'utiliser sans restrictions"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Touchez ici pour en savoir plus."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Désactivé : <xliff:g id="LABEL">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index cdd622fbd2f9..786b186c1e31 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -597,15 +597,15 @@ <string name="phoneTypeOther" msgid="1544425847868765990">"Autre"</string> <string name="phoneTypeCallback" msgid="2712175203065678206">"Rappel"</string> <string name="phoneTypeCar" msgid="8738360689616716982">"Voiture"</string> - <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Accueil entreprise"</string> + <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Entreprise (principal)"</string> <string name="phoneTypeIsdn" msgid="8022453193171370337">"RNIS"</string> <string name="phoneTypeMain" msgid="6766137010628326916">"Principal"</string> <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Autre télécopie"</string> <string name="phoneTypeRadio" msgid="4093738079908667513">"Radio"</string> <string name="phoneTypeTelex" msgid="3367879952476250512">"Télex"</string> <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY/TTD"</string> - <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Mobile prof."</string> - <string name="phoneTypeWorkPager" msgid="649938731231157056">"Bipeur prof."</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Mobile pro"</string> + <string name="phoneTypeWorkPager" msgid="649938731231157056">"Bipeur pro"</string> <string name="phoneTypeAssistant" msgid="5596772636128562884">"Assistant"</string> <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string> <string name="eventTypeCustom" msgid="7837586198458073404">"Personnalisé"</string> @@ -891,6 +891,38 @@ <item quantity="one">dans <xliff:g id="COUNT_1">%d</xliff:g> a</item> <item quantity="other">dans <xliff:g id="COUNT_1">%d</xliff:g> a</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="one">il y a <xliff:g id="COUNT_1">%d</xliff:g> minute</item> + <item quantity="other">il y a <xliff:g id="COUNT_1">%d</xliff:g> minutes</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="one">il y a <xliff:g id="COUNT_1">%d</xliff:g> heure</item> + <item quantity="other">il y a <xliff:g id="COUNT_1">%d</xliff:g> heures</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="one">il y a <xliff:g id="COUNT_1">%d</xliff:g> jour</item> + <item quantity="other">il y a <xliff:g id="COUNT_1">%d</xliff:g> jours</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="one">il y a <xliff:g id="COUNT_1">%d</xliff:g> an</item> + <item quantity="other">il y a <xliff:g id="COUNT_1">%d</xliff:g> ans</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="one">dans <xliff:g id="COUNT_1">%d</xliff:g> minute</item> + <item quantity="other">dans <xliff:g id="COUNT_1">%d</xliff:g> minutes</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="one">dans <xliff:g id="COUNT_1">%d</xliff:g> heure</item> + <item quantity="other">dans <xliff:g id="COUNT_1">%d</xliff:g> heures</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="one">dans <xliff:g id="COUNT_1">%d</xliff:g> jour</item> + <item quantity="other">dans <xliff:g id="COUNT_1">%d</xliff:g> jours</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="one">dans <xliff:g id="COUNT_1">%d</xliff:g> an</item> + <item quantity="other">dans <xliff:g id="COUNT_1">%d</xliff:g> ans</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Problème vidéo"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Impossible de lire cette vidéo en streaming sur cet appareil."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Impossible de lire la vidéo."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"Le processus <xliff:g id="PROCESS">%1$s</xliff:g> a cessé de fonctionner."</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> ne cesse de s\'arrêter."</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"Le processus \"<xliff:g id="PROCESS">%1$s</xliff:g>\" ne cesse de s\'arrêter."</string> - <string name="aerr_restart" msgid="9001379185665886595">"Redémarrer l\'application"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Réinitialiser et redémarrer l\'application"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Rouvrir l\'application"</string> <string name="aerr_report" msgid="5371800241488400617">"Envoyer des commentaires"</string> <string name="aerr_close" msgid="2991640326563991340">"Fermer"</string> <string name="aerr_mute" msgid="1974781923723235953">"Ignorer jusqu\'au redémarrage de l\'appareil"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"\"<xliff:g id="KEY">%1$s</xliff:g>\" supprimé"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> (travail)"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Pour annuler l\'épinglage, appuyez de manière prolongée sur \"Retour\"."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Pour annuler l\'épinglage, appuyez de manière prolongée sur \"Vue d\'ensemble\"."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"L\'application est épinglée. L\'annulation de l\'épinglage n\'est pas autorisée sur cet appareil."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Écran épinglé."</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Épinglage d\'écran annulé."</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"La requête SS a été remplacée par une requête USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"La requête SS a été remplacée par une autre requête SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Profil professionnel"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Bouton \"Développer\""</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"activer/désactiver le développement"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Port du périphérique USB Android"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"Port du périphérique USB"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Fermer la barre d\'outils en superposition"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Agrandir"</string> <string name="close_button_text" msgid="3937902162644062866">"Fermer"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> élément sélectionné</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> éléments sélectionnés</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"− <xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Rétablir la configuration d\'usine pour utiliser cet appareil sans restrictions"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Appuyez ici pour en savoir plus."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Élément \"<xliff:g id="LABEL">%1$s</xliff:g>\" désactivé"</string> </resources> diff --git a/core/res/res/values-gl-rES/strings.xml b/core/res/res/values-gl-rES/strings.xml index 5317a84d12ba..809d5ec1f997 100644 --- a/core/res/res/values-gl-rES/strings.xml +++ b/core/res/res/values-gl-rES/strings.xml @@ -595,9 +595,9 @@ <string name="phoneTypeFaxHome" msgid="2067265972322971467">"Fax particular"</string> <string name="phoneTypePager" msgid="7582359955394921732">"Busca"</string> <string name="phoneTypeOther" msgid="1544425847868765990">"Outro"</string> - <string name="phoneTypeCallback" msgid="2712175203065678206">"Chamada de retorno"</string> + <string name="phoneTypeCallback" msgid="2712175203065678206">"Devolver chamada"</string> <string name="phoneTypeCar" msgid="8738360689616716982">"Coche"</string> - <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Principal da empresa"</string> + <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Empresa (ppal.)"</string> <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string> <string name="phoneTypeMain" msgid="6766137010628326916">"Principal"</string> <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Outro fax"</string> @@ -606,7 +606,7 @@ <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY TDD"</string> <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Móbil do traballo"</string> <string name="phoneTypeWorkPager" msgid="649938731231157056">"Busca do traballo"</string> - <string name="phoneTypeAssistant" msgid="5596772636128562884">"Axudante"</string> + <string name="phoneTypeAssistant" msgid="5596772636128562884">"Asistente"</string> <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string> <string name="eventTypeCustom" msgid="7837586198458073404">"Personalizados"</string> <string name="eventTypeBirthday" msgid="2813379844211390740">"Aniversario"</string> @@ -639,7 +639,7 @@ <string name="orgTypeOther" msgid="3951781131570124082">"Outra"</string> <string name="orgTypeCustom" msgid="225523415372088322">"Personalizado"</string> <string name="relationTypeCustom" msgid="3542403679827297300">"Personalizada"</string> - <string name="relationTypeAssistant" msgid="6274334825195379076">"Axudante"</string> + <string name="relationTypeAssistant" msgid="6274334825195379076">"Asistente"</string> <string name="relationTypeBrother" msgid="8757913506784067713">"Irmán"</string> <string name="relationTypeChild" msgid="1890746277276881626">"Fillo/a"</string> <string name="relationTypeDomesticPartner" msgid="6904807112121122133">"Parella de feito"</string> @@ -891,6 +891,38 @@ <item quantity="other">en <xliff:g id="COUNT_1">%d</xliff:g> a</item> <item quantity="one">en <xliff:g id="COUNT_0">%d</xliff:g> a</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other">hai <xliff:g id="COUNT_1">%d</xliff:g> minutos</item> + <item quantity="one">hai <xliff:g id="COUNT_0">%d</xliff:g> minuto</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other">hai <xliff:g id="COUNT_1">%d</xliff:g> horas</item> + <item quantity="one">hai <xliff:g id="COUNT_0">%d</xliff:g> hora</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other">hai <xliff:g id="COUNT_1">%d</xliff:g> días</item> + <item quantity="one">hai <xliff:g id="COUNT_0">%d</xliff:g> día</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other">hai <xliff:g id="COUNT_1">%d</xliff:g> anos</item> + <item quantity="one">hai <xliff:g id="COUNT_0">%d</xliff:g> ano</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other">en <xliff:g id="COUNT_1">%d</xliff:g> minutos</item> + <item quantity="one">en <xliff:g id="COUNT_0">%d</xliff:g> minuto</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other">en <xliff:g id="COUNT_1">%d</xliff:g> horas</item> + <item quantity="one">en <xliff:g id="COUNT_0">%d</xliff:g> hora</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other">en <xliff:g id="COUNT_1">%d</xliff:g> días</item> + <item quantity="one">en <xliff:g id="COUNT_0">%d</xliff:g> día</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other">en <xliff:g id="COUNT_1">%d</xliff:g> anos</item> + <item quantity="one">en <xliff:g id="COUNT_0">%d</xliff:g> ano</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Hai un problema co vídeo"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Este vídeo non se pode transmitir no dispositivo."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Non se pode reproducir este vídeo."</string> @@ -962,9 +994,8 @@ <string name="aerr_process" msgid="6201597323218674729">"Detívose <xliff:g id="PROCESS">%1$s</xliff:g>"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> segue deténdose"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> segue deténdose"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Reiniciar aplicación"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Restablecer e reiniciar aplicación"</string> - <string name="aerr_report" msgid="5371800241488400617">"Dános a túa opinión"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Abrir aplicación de novo"</string> + <string name="aerr_report" msgid="5371800241488400617">"Enviar comentarios"</string> <string name="aerr_close" msgid="2991640326563991340">"Pechar"</string> <string name="aerr_mute" msgid="1974781923723235953">"Ignorar fallos ata que o dispositivo se reinicie"</string> <string name="aerr_wait" msgid="3199956902437040261">"Esperar"</string> @@ -1515,7 +1546,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> eliminado"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> do traballo"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Para soltar a pantalla, mantén premido Volver."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Para soltar a pantalla, mantén premido Visión xeral."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"A aplicación está fixada: non se permite soltala neste dispositivo."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Pantalla fixada"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Pantalla desactivada"</string> @@ -1582,6 +1612,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"A solicitude SS transformouse nunha solicitude USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"A solicitude SS transformouse nunha nova solicitude SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Perfil de traballo"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Botón Despregar"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"alterna a expansión"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Porto periférico USB de Android"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"Porto periférico USB"</string> @@ -1589,6 +1621,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Pechar barra de ferramentas adicional"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Maximizar"</string> <string name="close_button_text" msgid="3937902162644062866">"Pechar"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other">Seleccionáronse <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="one">Seleccionouse <xliff:g id="COUNT_0">%1$d</xliff:g></item> @@ -1621,4 +1655,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Restablecemento dos valores de fábrica para usar este dispositivo sen restricións"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Toca para acceder a máis información"</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Desactivouse <xliff:g id="LABEL">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-gu-rIN/strings.xml b/core/res/res/values-gu-rIN/strings.xml index c069c15d81aa..d1f751417451 100644 --- a/core/res/res/values-gu-rIN/strings.xml +++ b/core/res/res/values-gu-rIN/strings.xml @@ -246,7 +246,7 @@ <string name="permgroupdesc_contacts" msgid="6951499528303668046">"તમારા સંપર્કોને ઍક્સેસ કરવાની"</string> <string name="permgrouplab_location" msgid="7275582855722310164">"સ્થાન"</string> <string name="permgroupdesc_location" msgid="1346617465127855033">"આ ઉપકરણના સ્થાનને ઍક્સેસ કરવાની"</string> - <string name="permgrouplab_calendar" msgid="5863508437783683902">"કેલેન્ડર"</string> + <string name="permgrouplab_calendar" msgid="5863508437783683902">"કૅલેન્ડર"</string> <string name="permgroupdesc_calendar" msgid="3889615280211184106">"તમારા કેલેન્ડરને ઍક્સેસ કરવાની"</string> <string name="permgrouplab_sms" msgid="228308803364967808">"SMS"</string> <string name="permgroupdesc_sms" msgid="4656988620100940350">"SMS સંદેશા મોકલવાની અને જોવાની"</string> @@ -257,7 +257,7 @@ <string name="permgrouplab_camera" msgid="4820372495894586615">"કૅમેરો"</string> <string name="permgroupdesc_camera" msgid="3250611594678347720">"ચિત્રો લેવાની અને વિડિઓ રેકોર્ડ કરવાની"</string> <string name="permgrouplab_phone" msgid="5229115638567440675">"ફોન"</string> - <string name="permgroupdesc_phone" msgid="6234224354060641055">"ફોન કૉલ કરો તથા સંચાલિત કરો"</string> + <string name="permgroupdesc_phone" msgid="6234224354060641055">"ફોન કૉલ કરો અને સંચાલિત કરો"</string> <string name="permgrouplab_sensors" msgid="416037179223226722">"બોડી સેન્સર્સ"</string> <string name="permgroupdesc_sensors" msgid="7147968539346634043">"તમારા મહત્વપૂર્ણ ચિહ્નો વિશે સેન્સર ડેટા ઍક્સેસ કરો"</string> <string name="capability_title_canRetrieveWindowContent" msgid="3901717936930170320">"વિંડો સામગ્રી પુનર્પ્રાપ્ત કરો"</string> @@ -346,14 +346,14 @@ <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"એપ્લિકેશનને ઇનકમિંગ અને આઉટગોઇંગ કૉલ્સ વિશેનાં ડેટા સહિત, તમારા ફોનના કૉલ લૉગને સંશોધિત કરવાની મંજૂરી આપે છે. દુર્ભાવનાપૂર્ણ ઍપ્લિકેશનો આનો ઉપયોગ તમારા કૉલ લૉગને કાઢી નાખવા અથવા સંશોધિત માટે કરી શકે છે."</string> <string name="permlab_bodySensors" msgid="4683341291818520277">"બૉડીસેન્સર્સ ઍક્સેસ(જેમકે હ્રદય ગતી મૉનિટર)"</string> <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"એપ્લિકેશનને તમારી હૃદય ગતિ જેવી તમારી શારીરિક સ્થિતિને મૉનિટર કરતાં સેન્સર્સથી ડેટા ઍક્સેસ કરવાની મંજૂરી આપે છે."</string> - <string name="permlab_readCalendar" msgid="5972727560257612398">"કેલેન્ડર ઇવેન્ટ્સ વત્તા ગોપનીયતા માહિતી વાંચો"</string> - <string name="permdesc_readCalendar" product="tablet" msgid="4216462049057658723">"એપ્લિકેશનને મિત્રોના અથવા સહકાર્યકરો સહિત તમારા ટેબ્લેટ પર સંગ્રહિત તમામ કેલેન્ડર ઇવેન્ટ્સ વાંચવાની મંજૂરી આપે છે. આ એપ્લિકેશનને તમારા કેલેન્ડર ડેટાને શેર કરવા કે સાચવવાની મંજૂરી આપી શકે છે, પછી ભલે ગોપનીયતા અથવા સંવેદિતા કોઈપણ હોય."</string> - <string name="permdesc_readCalendar" product="tv" msgid="3191352452242394196">"એપ્લિકેશનને મિત્રોના અથવા સહકાર્યકરો સહિત તમારા ટીવી પર સંગ્રહિત તમામ કેલેન્ડર ઇવેન્ટ્સ વાંચવાની મંજૂરી આપે છે. આ એપ્લિકેશનને તમારા કેલેન્ડર ડેટાને શેર કરવા કે સાચવવાની મંજૂરી આપી શકે છે, પછી ભલે ગોપનીયતા અથવા સંવેદિતા કોઈપણ હોય."</string> - <string name="permdesc_readCalendar" product="default" msgid="7434548682470851583">"એપ્લિકેશનને મિત્રોના અથવા સહકાર્યકરો સહિત તમારા ફોન પર સંગ્રહિત તમામ કેલેન્ડર ઇવેન્ટ્સ વાંચવાની મંજૂરી આપે છે. આ એપ્લિકેશનને તમારા કેલેન્ડર ડેટાને શેર કરવા કે સાચવવાની મંજૂરી આપી શકે છે, પછી ભલે ગોપનીયતા અથવા સંવેદિતા કોઈપણ હોય."</string> - <string name="permlab_writeCalendar" msgid="8438874755193825647">"કેલેન્ડર ઇવેન્ટ્સ ઉમેરો અથવા સંશોધિત કરો અને માલિકની જાણ બહાર અતિથિઓને ઇમેઇલ મોકલો"</string> - <string name="permdesc_writeCalendar" product="tablet" msgid="6679035520113668528">"એપ્લિકેશનને મિત્રોના અથવા સહકાર્યકરો સહિત તમારા ટેબ્લેટ પર તમે સંશોધિત કરી શકો તે ઇવેન્ટ્સ ઉમેરવા, દૂર કરવા, બદલવાની મંજૂરી આપે છે. આ એપ્લિકેશનને કેલેન્ડર માલિક તરફથી આવતાં હોય તેવા સંદેશા મોકલવાની અથવા માલિકની જાણ વિના ઇવેન્ટ્સ સંશોધિત કરવાની મંજૂરી આપી શકે છે."</string> - <string name="permdesc_writeCalendar" product="tv" msgid="1273290605500902507">"એપ્લિકેશનને મિત્રોના અથવા સહકાર્યકરો સહિત તમારા ટીવી પર તમે સંશોધિત કરી શકો તે ઇવેન્ટ્સ ઉમેરવા, દૂર કરવા, બદલવાની મંજૂરી આપે છે. આ એપ્લિકેશનને કેલેન્ડર માલિક તરફથી આવતાં હોય તેવા સંદેશા મોકલવાની અથવા માલિકની જાણ વિના ઇવેન્ટ્સ સંશોધિત કરવાની મંજૂરી આપી શકે છે."</string> - <string name="permdesc_writeCalendar" product="default" msgid="2324469496327249376">"એપ્લિકેશનને મિત્રોના અથવા સહકાર્યકરો સહિત તમારા ફોન પર તમે સંશોધિત કરી શકો તે ઇવેન્ટ્સ ઉમેરવા, દૂર કરવા, બદલવાની મંજૂરી આપે છે. આ એપ્લિકેશનને કેલેન્ડર માલિક તરફથી આવતાં હોય તેવા સંદેશા મોકલવાની અથવા માલિકની જાણ વિના ઇવેન્ટ્સ સંશોધિત કરવાની મંજૂરી આપી શકે છે."</string> + <string name="permlab_readCalendar" msgid="5972727560257612398">"કૅલેન્ડર ઇવેન્ટ્સ વત્તા ગોપનીયતા માહિતી વાંચો"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4216462049057658723">"એપ્લિકેશનને મિત્રોના અથવા સહકાર્યકરો સહિત તમારા ટેબ્લેટ પર સંગ્રહિત તમામ કૅલેન્ડર ઇવેન્ટ્સ વાંચવાની મંજૂરી આપે છે. આ એપ્લિકેશનને તમારા કૅલેન્ડર ડેટાને શેર કરવા કે સાચવવાની મંજૂરી આપી શકે છે, પછી ભલે ગોપનીયતા અથવા સંવેદિતા કોઈપણ હોય."</string> + <string name="permdesc_readCalendar" product="tv" msgid="3191352452242394196">"એપ્લિકેશનને મિત્રોના અથવા સહકાર્યકરો સહિત તમારા ટીવી પર સંગ્રહિત તમામ કૅલેન્ડર ઇવેન્ટ્સ વાંચવાની મંજૂરી આપે છે. આ એપ્લિકેશનને તમારા કૅલેન્ડર ડેટાને શેર કરવા કે સાચવવાની મંજૂરી આપી શકે છે, પછી ભલે ગોપનીયતા અથવા સંવેદિતા કોઈપણ હોય."</string> + <string name="permdesc_readCalendar" product="default" msgid="7434548682470851583">"એપ્લિકેશનને મિત્રોના અથવા સહકાર્યકરો સહિત તમારા ફોન પર સંગ્રહિત તમામ કૅલેન્ડર ઇવેન્ટ્સ વાંચવાની મંજૂરી આપે છે. આ એપ્લિકેશનને તમારા કૅલેન્ડર ડેટાને શેર કરવા કે સાચવવાની મંજૂરી આપી શકે છે, પછી ભલે ગોપનીયતા અથવા સંવેદિતા કોઈપણ હોય."</string> + <string name="permlab_writeCalendar" msgid="8438874755193825647">"કૅલેન્ડર ઇવેન્ટ્સ ઉમેરો અથવા સંશોધિત કરો અને માલિકની જાણ બહાર અતિથિઓને ઇમેઇલ મોકલો"</string> + <string name="permdesc_writeCalendar" product="tablet" msgid="6679035520113668528">"એપ્લિકેશનને મિત્રોના અથવા સહકાર્યકરો સહિત તમારા ટેબ્લેટ પર તમે સંશોધિત કરી શકો તે ઇવેન્ટ્સ ઉમેરવા, દૂર કરવા, બદલવાની મંજૂરી આપે છે. આ એપ્લિકેશનને કૅલેન્ડર માલિક તરફથી આવતાં હોય તેવા સંદેશા મોકલવાની અથવા માલિકની જાણ વિના ઇવેન્ટ્સ સંશોધિત કરવાની મંજૂરી આપી શકે છે."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="1273290605500902507">"એપ્લિકેશનને મિત્રોના અથવા સહકાર્યકરો સહિત તમારા ટીવી પર તમે સંશોધિત કરી શકો તે ઇવેન્ટ્સ ઉમેરવા, દૂર કરવા, બદલવાની મંજૂરી આપે છે. આ એપ્લિકેશનને કૅલેન્ડર માલિક તરફથી આવતાં હોય તેવા સંદેશા મોકલવાની અથવા માલિકની જાણ વિના ઇવેન્ટ્સ સંશોધિત કરવાની મંજૂરી આપી શકે છે."</string> + <string name="permdesc_writeCalendar" product="default" msgid="2324469496327249376">"એપ્લિકેશનને મિત્રોના અથવા સહકાર્યકરો સહિત તમારા ફોન પર તમે સંશોધિત કરી શકો તે ઇવેન્ટ્સ ઉમેરવા, દૂર કરવા, બદલવાની મંજૂરી આપે છે. આ એપ્લિકેશનને કૅલેન્ડર માલિક તરફથી આવતાં હોય તેવા સંદેશા મોકલવાની અથવા માલિકની જાણ વિના ઇવેન્ટ્સ સંશોધિત કરવાની મંજૂરી આપી શકે છે."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"વધારાના સ્થાન પ્રદાતા આદેશોને ઍક્સેસ કરો"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"એપ્લિકેશનને વધારાના સ્થાન પ્રદાતા આદેશોને ઍક્સેસ કરવાની મંજૂરી આપે છે. આ એપ્લિકેશનને GPS અથવા અન્ય સ્થાન સ્રોતોના ઓપરેશનમાં દખલ કરવાની મંજૂરી આપી શકે છે."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"નિશ્ચિત સ્થાન ઍક્સેસ કરો (GPS અને નેટવર્ક-આધારિત)"</string> @@ -537,7 +537,7 @@ <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"ઉપકરણ વૈશ્વિક પ્રોક્સી સેટ કરો"</string> <string name="policydesc_setGlobalProxy" msgid="8459859731153370499">"નીતિ સક્ષમ હોય તે વખતે ઉપયોગ કરવા માટેના ઉપકરણ વૈશ્વિક પ્રોક્સીને સેટ કરો. ફક્ત ઉપકરણના માલિક વૈશ્વિક પ્રોક્સી સેટ કરી શકે છે."</string> <string name="policylab_expirePassword" msgid="5610055012328825874">"સ્ક્રીન લૉક પાસવર્ડ સમાપ્તિ સેટ કરો"</string> - <string name="policydesc_expirePassword" msgid="5367525762204416046">"કેટલીવાર સ્ક્રીન લૉક પાસવર્ડ, PIN અથવા નમૂનો બદલવો આવશ્યક છે તેને બદલો."</string> + <string name="policydesc_expirePassword" msgid="5367525762204416046">"કેટલીવાર સ્ક્રીન લૉક પાસવર્ડ, PIN અથવા પેટર્ન બદલવો આવશ્યક છે તેને બદલો."</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"સંગ્રહ એન્ક્રિપ્શન સેટ કરો"</string> <string name="policydesc_encryptedStorage" msgid="2637732115325316992">"જરૂરી છે કે સંગ્રહિત ઍપ્લિકેશન એન્ક્રિપ્ટ થાય."</string> <string name="policylab_disableCamera" msgid="6395301023152297826">"કૅમેરા અક્ષમ કરો"</string> @@ -891,6 +891,38 @@ <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g>વ. માં</item> <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>વ. માં</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> મિનિટ પહેલાં</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> મિનિટ પહેલાં</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> કલાક પહેલાં</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> કલાક પહેલાં</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> દિવસ પહેલાં</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> દિવસ પહેલાં</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> વર્ષ પહેલાં</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> વર્ષ પહેલાં</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> મિનિટમાં</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> મિનિટમાં</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> કલાકમાં</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> કલાકમાં</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> દિવસમાં</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> દિવસમાં</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> વર્ષમાં</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> વર્ષમાં</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"વિડિઓમાં સમસ્યા"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"આ ઉપકરણ પર સ્ટ્રીમ કરવા માટે આ વિડિઓ માન્ય નથી."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"આ વિડિઓ ચલાવી શકતાં નથી."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> બંધ થઈ ગઈ છે"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> રોકાઈ રહી છે"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> રોકાઈ રહી છે"</string> - <string name="aerr_restart" msgid="9001379185665886595">"ઍપ્લિકેશનને ફરીથી પ્રારંભ કરો"</string> - <string name="aerr_reset" msgid="7645427603514220451">"ફરીથી સેટ કરો અને ઍપ્લિકેશનને ફરીથી પ્રારંભ કરો"</string> + <string name="aerr_restart" msgid="7581308074153624475">"ઍપ્લિકેશન ફરીથી ખોલો"</string> <string name="aerr_report" msgid="5371800241488400617">"પ્રતિસાદ મોકલો"</string> <string name="aerr_close" msgid="2991640326563991340">"બંધ કરો"</string> <string name="aerr_mute" msgid="1974781923723235953">"ઉપકરણ પુનઃપ્રારંભ ન થાય ત્યાં સુધી મ્યૂટ કરો"</string> @@ -1515,7 +1546,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> કાઢી નાખી"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"કાર્યાલય <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"આ સ્ક્રીનને અનપિન કરવા માટે, પાછળને ટચ કરીને પકડી રાખો."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"આ સ્ક્રીનને અનપિન કરવા માટે, વિહંગાવલોકન કરોને ટચ કરો અને પકડો."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"ઍપ્લિકેશન પિન કરેલ છે. આ ઉપકરણ પર અનપિન કરવાની મંજૂરી નથી."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"સ્ક્રીન પિન કરી"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"સ્ક્રીન અનપિન કરી"</string> @@ -1582,6 +1612,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS વિનંતીને USSD વિનંતી પર સંશોધિત કરી."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS વિનંતીને નવી SS વિનંતી પર સંશોધિત કરી."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"કાર્ય પ્રોફાઇલ"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"વિસ્તૃત કરો બટન"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"વિસ્તરણ ટૉગલ કરો"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB પેરિફેરલ પોર્ટ"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB પેરિફેરલ પોર્ટ"</string> @@ -1589,6 +1621,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"ઓવરફ્લો બંધ કરો"</string> <string name="maximize_button_text" msgid="7543285286182446254">"મહત્તમ કરો"</string> <string name="close_button_text" msgid="3937902162644062866">"બંધ કરો"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> પસંદ કરી</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> પસંદ કરી</item> @@ -1621,4 +1655,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"આ ઉપકરણનો પ્રતિબંધો વિના ઉપયોગ કરવા માટે ફેક્ટરી રીસેટ કરો"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"વધુ જાણવા માટે ટચ કરો."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> અક્ષમ કર્યું"</string> </resources> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index 6ba19ef10f66..805d9e13daf5 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -891,6 +891,38 @@ <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> वर्ष में</item> <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> वर्ष में</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> मिनट पहले</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> मिनट पहले</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> घंटे पहले</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> घंटे पहले</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> दिन पहले</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> दिन पहले</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> वर्ष पहले</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> वर्ष पहले</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> मिनट में</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> मिनट में</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> घंटे में</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> घंटे में</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> दिनों में</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> दिनों में</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> वर्षों में</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> वर्षों में</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"वीडियो समस्याएं"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"यह वीडियो इस डिवाइस पर स्ट्रीमिंग के लिए मान्य नहीं है."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"यह वीडियो नहीं चलाया जा सकता."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> रुक गई है"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> रुक रहा है"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> रुक रही है"</string> - <string name="aerr_restart" msgid="9001379185665886595">"ऐप पुनः प्रारंभ करें"</string> - <string name="aerr_reset" msgid="7645427603514220451">"ऐप रीसेट करें और पुन: प्रारंभ करें"</string> + <string name="aerr_restart" msgid="7581308074153624475">"ऐप्लिकेशन फिर से खोलें"</string> <string name="aerr_report" msgid="5371800241488400617">"फ़ीडबैक भेजें"</string> <string name="aerr_close" msgid="2991640326563991340">"बंद करें"</string> <string name="aerr_mute" msgid="1974781923723235953">"डिवाइस पुन: प्रारंभ होने तक म्यूट करें"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> को हटा दिया गया"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"कार्यस्थल का <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"इस स्क्रीन को अनपिन करने के लिए, वापस जाएं को स्पर्श करके रखें."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"इस स्क्रीन को अनपिन करने के लिए, अवलोकन को स्पर्श करके रखें."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"ऐप पिन किया गया है: इस डिवाइस पर अनपिन करने की अनुमति नहीं है."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"स्क्रीन पिन की गई"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"स्क्रीन अनपिन की गई"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS अनुरोध को USSD अनुरोध में बदल दिया गया है."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS अनुरोध को नए SS अनुरोध में बदल दिया गया है."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"कार्य प्रोफ़ाइल"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"विस्तृत करें बटन"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"टॉगल विस्तार"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB पेरिफ़ेरल पोर्ट"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB पेरिफ़ेरल पोर्ट"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"ओवरफ़्लो बंद करें"</string> <string name="maximize_button_text" msgid="7543285286182446254">"बड़ा करें"</string> <string name="close_button_text" msgid="3937902162644062866">"बंद करें"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> चयनित</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> चयनित</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"इस डिवाइस को प्रतिबंधों के बिना उपयोग करने के लिए फ़ैक्टरी रीसेट करें"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"अधिक जानने के लिए स्पर्श करें."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"अक्षम <xliff:g id="LABEL">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index 60de8527d41a..b875f284fc0c 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -906,6 +906,46 @@ <item quantity="few">za <xliff:g id="COUNT_1">%d</xliff:g> g</item> <item quantity="other">za <xliff:g id="COUNT_1">%d</xliff:g> g</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="one">prije <xliff:g id="COUNT_1">%d</xliff:g> minute</item> + <item quantity="few">prije <xliff:g id="COUNT_1">%d</xliff:g> minute</item> + <item quantity="other">prije <xliff:g id="COUNT_1">%d</xliff:g> minuta</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="one">prije <xliff:g id="COUNT_1">%d</xliff:g> sata</item> + <item quantity="few">prije <xliff:g id="COUNT_1">%d</xliff:g> sata</item> + <item quantity="other">prije <xliff:g id="COUNT_1">%d</xliff:g> sati</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="one">prije <xliff:g id="COUNT_1">%d</xliff:g> dana</item> + <item quantity="few">prije <xliff:g id="COUNT_1">%d</xliff:g> dana</item> + <item quantity="other">prije <xliff:g id="COUNT_1">%d</xliff:g> dana</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="one">prije <xliff:g id="COUNT_1">%d</xliff:g> godine</item> + <item quantity="few">prije <xliff:g id="COUNT_1">%d</xliff:g> godine</item> + <item quantity="other">prije <xliff:g id="COUNT_1">%d</xliff:g> godina</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="one">za <xliff:g id="COUNT_1">%d</xliff:g> minutu</item> + <item quantity="few">za <xliff:g id="COUNT_1">%d</xliff:g> minute</item> + <item quantity="other">za <xliff:g id="COUNT_1">%d</xliff:g> minuta</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="one">za <xliff:g id="COUNT_1">%d</xliff:g> sat</item> + <item quantity="few">za <xliff:g id="COUNT_1">%d</xliff:g> sata</item> + <item quantity="other">za <xliff:g id="COUNT_1">%d</xliff:g> sati</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="one">za <xliff:g id="COUNT_1">%d</xliff:g> dan</item> + <item quantity="few">za <xliff:g id="COUNT_1">%d</xliff:g> dana</item> + <item quantity="other">za <xliff:g id="COUNT_1">%d</xliff:g> dana</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="one">za <xliff:g id="COUNT_1">%d</xliff:g> godinu</item> + <item quantity="few">za <xliff:g id="COUNT_1">%d</xliff:g> godine</item> + <item quantity="other">za <xliff:g id="COUNT_1">%d</xliff:g> godina</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Problem s videozapisom"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Ovaj videozapis nije valjan za streaming na ovaj uređaj."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Ovaj videozapis nije moguće reproducirati."</string> @@ -977,8 +1017,7 @@ <string name="aerr_process" msgid="6201597323218674729">"Postupak <xliff:g id="PROCESS">%1$s</xliff:g> je zaustavljen"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"Aplikacija <xliff:g id="APPLICATION">%1$s</xliff:g> neprekidno se ruši"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"Postupak <xliff:g id="PROCESS">%1$s</xliff:g> neprekidno se ruši"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Ponovo pokreni aplikaciju"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Vrati aplikaciju na zadano i pokreni ponovo"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Ponovo otvori aplikaciju"</string> <string name="aerr_report" msgid="5371800241488400617">"Pošalji povratne informacije"</string> <string name="aerr_close" msgid="2991640326563991340">"Zatvori"</string> <string name="aerr_mute" msgid="1974781923723235953">"Zanemari do ponovnog pokretanja uređaja"</string> @@ -1531,7 +1570,6 @@ <string name="deleted_key" msgid="7659477886625566590">"Izbrisan je broj <xliff:g id="KEY">%1$s</xliff:g>"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> za posao"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Da biste otkvačili ovaj zaslon, dodirnite i zadržite Natrag."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Da biste otkvačili ovaj zaslon, dodirnite i zadržite Pregled."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Aplikacija je prikvačena: otkvačivanje nije dopušteno na tom uređaju."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Zaslon je pričvršćen"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Zaslon je otkvačen"</string> @@ -1606,6 +1644,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS zahtjev izmijenjen je u USSD zahtjev."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS zahtjev izmijenjen je u novi SS zahtjev."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Radni profil"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Gumb za proširivanje"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"promjena proširenja"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Androidov USB priključak za periferne uređaje"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB priključak za periferne uređaje"</string> @@ -1613,6 +1653,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Zatvori dodatni izbornik"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Maksimiziraj"</string> <string name="close_button_text" msgid="3937902162644062866">"Zatvori"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> odabrana</item> <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> odabrane</item> @@ -1646,4 +1688,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Uređaj je vraćen na tvorničke postavke da biste ga mogli upotrebljavati bez ograničenja"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Dodirnite da biste saznali više."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> – onemogućeno"</string> </resources> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index 1a01aca2e489..d903f9c2478e 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -891,6 +891,38 @@ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> éven belül</item> <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> éven belül</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> perccel ezelőtt</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> perccel ezelőtt</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> órával ezelőtt</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> órával ezelőtt</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> nappal ezelőtt</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> nappal ezelőtt</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> évvel ezelőtt</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> évvel ezelőtt</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> percen belül</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> percen belül</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> órán belül</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> órán belül</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> napon belül</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> napon belül</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> éven belül</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> éven belül</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Videoprobléma"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Ezt a videót nem lehet megjeleníteni ezen az eszközön."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Nem lehet lejátszani ezt a videót."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> – az alkalmazás leállt"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"A(z) <xliff:g id="APPLICATION">%1$s</xliff:g> alkalmazás állandóan leáll"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"A(z) <xliff:g id="PROCESS">%1$s</xliff:g> folyamat állandóan leáll"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Alkalmazás újraindítása"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Alkalmazás alaphelyzetbe állítása és újraindítása"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Alkalmazás ismételt megnyitása"</string> <string name="aerr_report" msgid="5371800241488400617">"Visszajelzés küldése"</string> <string name="aerr_close" msgid="2991640326563991340">"Bezárás"</string> <string name="aerr_mute" msgid="1974781923723235953">"Némítás az eszköz újraindulásáig"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"A(z) <xliff:g id="KEY">%1$s</xliff:g> érték törölve"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"Munkahelyi <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"A képernyő rögzítésének feloldásához tartsa lenyomva a Vissza lehetőséget."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"A képernyő rögzítésének feloldásához tartsa lenyomva az Áttekintés lehetőséget."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Az alkalmazás rögzítve van: a rögzítés feloldása nem engedélyezett ezen az eszközön."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Képernyő rögzítve"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Képernyő rögzítése feloldva"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Az SS-kérés módosítva USSD-kérésre."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Az SS-kérés módosítva új SS-kérésre."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Munkaprofil"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Kibontás gomb"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"kibontás be- és kikapcsolása"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB-perifériaport"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB-perifériaport"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"További elemeket tartalmazó eszköztár bezárása"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Teljes méret"</string> <string name="close_button_text" msgid="3937902162644062866">"Bezárás"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> kiválasztva</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> kiválasztva</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Állítsa vissza a gyári beállításokat az eszköz korlátozások nélküli használata érdekében"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Érintse meg a további információkért."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"A(z) <xliff:g id="LABEL">%1$s</xliff:g> letiltva"</string> </resources> diff --git a/core/res/res/values-hy-rAM/strings.xml b/core/res/res/values-hy-rAM/strings.xml index 2b935cd9a138..30f073746d3e 100644 --- a/core/res/res/values-hy-rAM/strings.xml +++ b/core/res/res/values-hy-rAM/strings.xml @@ -24,7 +24,7 @@ <string name="kilobyteShort" msgid="5973789783504771878">"ԿԲ"</string> <string name="megabyteShort" msgid="6355851576770428922">"ՄԲ"</string> <string name="gigabyteShort" msgid="3259882455212193214">"ԳԲ"</string> - <string name="terabyteShort" msgid="231613018159186962">"Տբ"</string> + <string name="terabyteShort" msgid="231613018159186962">"ՏԲ"</string> <string name="petabyteShort" msgid="5637816680144990219">"Պբ"</string> <string name="fileSizeSuffix" msgid="8897567456150907538">"<xliff:g id="NUMBER">%1$s</xliff:g> <xliff:g id="UNIT">%2$s</xliff:g>"</string> <string name="durationDays" msgid="6652371460511178259">"<xliff:g id="DAYS">%1$d</xliff:g> օր"</string> @@ -243,11 +243,11 @@ <string name="user_owner_label" msgid="1119010402169916617">"Անցնել անհատական պրոֆիլին"</string> <string name="managed_profile_label" msgid="5289992269827577857">"Անցնել աշխատանքային պրոֆիլին"</string> <string name="permgrouplab_contacts" msgid="3657758145679177612">"Կոնտակտներ"</string> - <string name="permgroupdesc_contacts" msgid="6951499528303668046">"կոնտակտների հասանելիություն"</string> + <string name="permgroupdesc_contacts" msgid="6951499528303668046">"օգտագործել ձեր կոնտակտները"</string> <string name="permgrouplab_location" msgid="7275582855722310164">"Տեղադրություն"</string> <string name="permgroupdesc_location" msgid="1346617465127855033">"օգտագործել այս սարքի տեղադրությունը"</string> <string name="permgrouplab_calendar" msgid="5863508437783683902">"Օրացույց"</string> - <string name="permgroupdesc_calendar" msgid="3889615280211184106">"օրացույցի հասանելիություն"</string> + <string name="permgroupdesc_calendar" msgid="3889615280211184106">"օգտագործել օրացույցը"</string> <string name="permgrouplab_sms" msgid="228308803364967808">"Կարճ հաղորդագրություն"</string> <string name="permgroupdesc_sms" msgid="4656988620100940350">"ուղարկել և դիտել SMS հաղորդագրությունները"</string> <string name="permgrouplab_storage" msgid="1971118770546336966">"Պահոց"</string> @@ -860,34 +860,66 @@ </plurals> <string name="now_string_shortest" msgid="8912796667087856402">"հիմա"</string> <plurals name="duration_minutes_shortest" formatted="false" msgid="3957499975064245495"> - <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ր.</item> - <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ր.</item> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g>ր</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>ր</item> </plurals> <plurals name="duration_hours_shortest" formatted="false" msgid="3552182110578602356"> - <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ժ.</item> - <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ժ.</item> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g>ժ</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>ժ</item> </plurals> <plurals name="duration_days_shortest" formatted="false" msgid="5213655532597081640"> - <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> օր</item> - <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> օր</item> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g>օր</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>օր</item> </plurals> <plurals name="duration_years_shortest" formatted="false" msgid="7848711145196397042"> - <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> տ.</item> - <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> տ.</item> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g>տ</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>տ</item> </plurals> <plurals name="duration_minutes_shortest_future" formatted="false" msgid="3277614521231489951"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g>ր-ից</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>ր-ից</item> + </plurals> + <plurals name="duration_hours_shortest_future" formatted="false" msgid="2152452368397489370"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g>ժ-ից</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>ժ-ից</item> + </plurals> + <plurals name="duration_days_shortest_future" formatted="false" msgid="8088331502820295701"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> օրից</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> օրից</item> + </plurals> + <plurals name="duration_years_shortest_future" formatted="false" msgid="2317006667145250301"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g>տ.-ուց</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>տ.-ուց</item> + </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> րոպե առաջ</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> րոպե առաջ</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ժամ առաջ</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ժամ առաջ</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> օր առաջ</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> օր առաջ</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> տարի առաջ</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> տարի առաջ</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> րոպեից</item> <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> րոպեից</item> </plurals> - <plurals name="duration_hours_shortest_future" formatted="false" msgid="2152452368397489370"> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ժամից</item> <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ժամից</item> </plurals> - <plurals name="duration_days_shortest_future" formatted="false" msgid="8088331502820295701"> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> օրից</item> <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> օրից</item> </plurals> - <plurals name="duration_years_shortest_future" formatted="false" msgid="2317006667145250301"> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> տարուց</item> <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> տարուց</item> </plurals> @@ -940,7 +972,7 @@ <string name="whichEditApplication" msgid="144727838241402655">"Խմբագրել հետևյալ ծրագրով՝"</string> <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Խմբագրել հետևյալով՝ %1$s"</string> <string name="whichEditApplicationLabel" msgid="7183524181625290300">"Փոփոխել"</string> - <string name="whichSendApplication" msgid="6902512414057341668">"Տարածել"</string> + <string name="whichSendApplication" msgid="6902512414057341668">"Կիսվել"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Տարածել ըստ %1$s"</string> <string name="whichSendApplicationLabel" msgid="4579076294675975354">"Տրամադրել"</string> <string name="whichSendToApplication" msgid="8272422260066642057">"Ուղարկել այս հավելվածով"</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> գործընթացն ընդհատվել է"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> հավելվածի աշխատանքը շարունակաբար ընդհատվում է"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> գործընթացը շարունակաբար ընդհատվում է"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Վերագործարկել հավելվածը"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Վերակայել և վերագործարկել հավելվածը"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Կրկին բացել հավելվածը"</string> <string name="aerr_report" msgid="5371800241488400617">"Ուղարկել կարծիք"</string> <string name="aerr_close" msgid="2991640326563991340">"Փակել"</string> <string name="aerr_mute" msgid="1974781923723235953">"Անջատել ձայնը մինչև սարքի վերագործարկումը"</string> @@ -1219,7 +1250,7 @@ <string name="action_mode_done" msgid="7217581640461922289">"Կատարված է"</string> <string name="progress_erasing" product="nosdcard" msgid="4521573321524340058">"Ջնջում է USB կրիչը..."</string> <string name="progress_erasing" product="default" msgid="6596988875507043042">"Ջնջում է SD քարտը..."</string> - <string name="share" msgid="1778686618230011964">"Տարածել"</string> + <string name="share" msgid="1778686618230011964">"Կիսվել"</string> <string name="find" msgid="4808270900322985960">"Գտնել"</string> <string name="websearch" msgid="4337157977400211589">"Վեբի որոնում"</string> <string name="find_next" msgid="5742124618942193978">"Գտնել հաջորդը"</string> @@ -1264,7 +1295,7 @@ <string name="keyboardview_keycode_enter" msgid="2985864015076059467">"Մուտք"</string> <string name="activitychooserview_choose_application" msgid="2125168057199941199">"Ընտրել ծրագիր"</string> <string name="activitychooserview_choose_application_error" msgid="8624618365481126668">"Չհաջողվեց գործարկել <xliff:g id="APPLICATION_NAME">%s</xliff:g> ծրագիրը"</string> - <string name="shareactionprovider_share_with" msgid="806688056141131819">"Տարածել"</string> + <string name="shareactionprovider_share_with" msgid="806688056141131819">"Կիսվել"</string> <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Կիսվել <xliff:g id="APPLICATION_NAME">%s</xliff:g>-ի հետ"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Սահող բռնակ: Հպել & պահել:"</string> <string name="description_target_unlock_tablet" msgid="3833195335629795055">"Սահեցրեք` ապակողպելու համար:"</string> @@ -1312,7 +1343,7 @@ <string name="sha1_fingerprint" msgid="7930330235269404581">"SHA-1մատնահետք`"</string> <string name="activity_chooser_view_see_all" msgid="4292569383976636200">"Տեսնել բոլորը"</string> <string name="activity_chooser_view_dialog_title_default" msgid="4710013864974040615">"Ընտրել գործունեությունը"</string> - <string name="share_action_provider_share_with" msgid="5247684435979149216">"Տարածել"</string> + <string name="share_action_provider_share_with" msgid="5247684435979149216">"Կիսվել"</string> <string name="sending" msgid="3245653681008218030">"Ուղարկվում է..."</string> <string name="launchBrowserDefault" msgid="2057951947297614725">"Գործարկե՞լ զննարկիչը:"</string> <string name="SetupCallDefault" msgid="5834948469253758575">"Ընդունե՞լ զանգը:"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> թիվը ջնջված է"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"Աշխատանքային <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Այս էկրանն ապամրացնելու համար հպեք և պահեք Հետ կոճակը:"</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Այս էկրանն ապամրացնելու համար հպեք և պահեք Համատեսքի կոճակը:"</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Հավելվածն ամրացված է: Ապամրացումն այս սարքում չի թույլատրվում:"</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Էկրանն ամրացված է"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Էկրանն ապամրացված է"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS հարցումը փոխվել է USSD հարցման:"</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS հարցումը փոխվել է նոր SS հարցման:"</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Աշխատանքային պրոֆիլ"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"«Ընդարձակել» կոճակ"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"փոխարկել ընդլայնումը"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB արտաքին միացք"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB արտաքին միացք"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Փակել ավելորդ տեղեկությունները"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Մեծացնել"</string> <string name="close_button_text" msgid="3937902162644062866">"Փակել"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="one">Ընտրված է՝ <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="other">Ընտրված է՝ <xliff:g id="COUNT_1">%1$d</xliff:g></item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Սարքն առանց սահմանափակումների օգտագործելու համար կատարեք գործարանային վերակայում"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Հպեք՝ ավելին իմանալու համար:"</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Անջատած <xliff:g id="LABEL">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index 8e7b87ec89f7..3f09da934ca1 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -546,7 +546,7 @@ <string name="policydesc_disableKeyguardFeatures" msgid="2044755691354158439">"Mencegah penggunaan beberapa fitur kunci layar."</string> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Rumah"</item> - <item msgid="869923650527136615">"Seluler"</item> + <item msgid="869923650527136615">"Ponsel"</item> <item msgid="7897544654242874543">"Kantor"</item> <item msgid="1103601433382158155">"Faks Kantor"</item> <item msgid="1735177144948329370">"Faks Rumah"</item> @@ -589,7 +589,7 @@ </string-array> <string name="phoneTypeCustom" msgid="1644738059053355820">"Khusus"</string> <string name="phoneTypeHome" msgid="2570923463033985887">"Rumah"</string> - <string name="phoneTypeMobile" msgid="6501463557754751037">"Seluler"</string> + <string name="phoneTypeMobile" msgid="6501463557754751037">"Ponsel"</string> <string name="phoneTypeWork" msgid="8863939667059911633">"Kantor"</string> <string name="phoneTypeFaxWork" msgid="3517792160008890912">"Faks Kantor"</string> <string name="phoneTypeFaxHome" msgid="2067265972322971467">"Faks Rumah"</string> @@ -616,7 +616,7 @@ <string name="emailTypeHome" msgid="449227236140433919">"Rumah"</string> <string name="emailTypeWork" msgid="3548058059601149973">"Kantor"</string> <string name="emailTypeOther" msgid="2923008695272639549">"Lainnya"</string> - <string name="emailTypeMobile" msgid="119919005321166205">"Seluler"</string> + <string name="emailTypeMobile" msgid="119919005321166205">"Ponsel"</string> <string name="postalTypeCustom" msgid="8903206903060479902">"Khusus"</string> <string name="postalTypeHome" msgid="8165756977184483097">"Rumah"</string> <string name="postalTypeWork" msgid="5268172772387694495">"Kantor"</string> @@ -891,6 +891,38 @@ <item quantity="other">dalam <xliff:g id="COUNT_1">%d</xliff:g>t</item> <item quantity="one">dalam <xliff:g id="COUNT_0">%d</xliff:g>t</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> menit lalu</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> menit lalu</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> jam lalu</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> jam lalu</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> hari lalu</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> hari lalu</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tahun lalu</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> tahun lalu</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other">dalam <xliff:g id="COUNT_1">%d</xliff:g> menit</item> + <item quantity="one">dalam <xliff:g id="COUNT_0">%d</xliff:g> menit</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other">dalam <xliff:g id="COUNT_1">%d</xliff:g> jam</item> + <item quantity="one">dalam <xliff:g id="COUNT_0">%d</xliff:g> jam</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other">dalam <xliff:g id="COUNT_1">%d</xliff:g> hari</item> + <item quantity="one">dalam <xliff:g id="COUNT_0">%d</xliff:g> hari</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other">dalam <xliff:g id="COUNT_1">%d</xliff:g> tahun</item> + <item quantity="one">dalam <xliff:g id="COUNT_0">%d</xliff:g> tahun</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Masalah video"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Video ini tidak valid untuk pengaliran ke perangkat ini."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Tidak dapat memutar video ini."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> telah berhenti"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> terus berhenti"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> terus berhenti"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Mulai ulang aplikasi"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Setel ulang dan mulai ulang aplikasi"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Buka aplikasi lagi"</string> <string name="aerr_report" msgid="5371800241488400617">"Kirim masukan"</string> <string name="aerr_close" msgid="2991640326563991340">"Tutup"</string> <string name="aerr_mute" msgid="1974781923723235953">"Bisukan hingga perangkat dimulai ulang"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> dihapus"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"Kantor <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Untuk melepas pin layar ini, sentuh & tahan tombol Kembali."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Untuk melepas pin layar ini, sentuh & tahan tombol Ringkasan."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Pin dipasang ke aplikasi. Melepas pin tidak diizinkan di perangkat ini."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Layar disematkan"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Layar dicopot sematannya"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Permintaan SS diubah menjadi permintaan USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Permintaan SS diubah menjadi permintaan SS baru."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Profil kerja"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Tombol luaskan"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"beralih ke perluasan"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Port Periferal USB Android"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"Port Periferal USB"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Tutup luapan"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Maksimalkan"</string> <string name="close_button_text" msgid="3937902162644062866">"Tutup"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> dipilih</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> dipilih</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Dikembalikan ke setelan pabrik agar perangkat ini dapat digunakan tanpa batasan"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Sentuh untuk mempelajari lebih lanjut."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> dinonaktifkan"</string> </resources> diff --git a/core/res/res/values-is-rIS/strings.xml b/core/res/res/values-is-rIS/strings.xml index 3ca3039e2bc4..6ac831584aca 100644 --- a/core/res/res/values-is-rIS/strings.xml +++ b/core/res/res/values-is-rIS/strings.xml @@ -548,8 +548,8 @@ <item msgid="8901098336658710359">"Heima"</item> <item msgid="869923650527136615">"Farsími"</item> <item msgid="7897544654242874543">"Vinna"</item> - <item msgid="1103601433382158155">"Faxnúmer í vinnu"</item> - <item msgid="1735177144948329370">"Faxnúmer heima"</item> + <item msgid="1103601433382158155">"Faxnr. í vinnu"</item> + <item msgid="1735177144948329370">"Faxnr. heima"</item> <item msgid="603878674477207394">"Símboði"</item> <item msgid="1650824275177931637">"Annað"</item> <item msgid="9192514806975898961">"Sérsniðið"</item> @@ -591,13 +591,13 @@ <string name="phoneTypeHome" msgid="2570923463033985887">"Heima"</string> <string name="phoneTypeMobile" msgid="6501463557754751037">"Farsími"</string> <string name="phoneTypeWork" msgid="8863939667059911633">"Vinna"</string> - <string name="phoneTypeFaxWork" msgid="3517792160008890912">"Faxnúmer í vinnunni"</string> - <string name="phoneTypeFaxHome" msgid="2067265972322971467">"Faxnúmer heima"</string> + <string name="phoneTypeFaxWork" msgid="3517792160008890912">"Faxnr. í vinnu"</string> + <string name="phoneTypeFaxHome" msgid="2067265972322971467">"Faxnr. heima"</string> <string name="phoneTypePager" msgid="7582359955394921732">"Símboði"</string> <string name="phoneTypeOther" msgid="1544425847868765990">"Annað"</string> <string name="phoneTypeCallback" msgid="2712175203065678206">"Svarhringing"</string> <string name="phoneTypeCar" msgid="8738360689616716982">"Bíll"</string> - <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Aðalnúmer fyrirtækis"</string> + <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Aðalnr. fyrirt."</string> <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string> <string name="phoneTypeMain" msgid="6766137010628326916">"Aðalsímanúmer"</string> <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Annað fax"</string> @@ -891,6 +891,38 @@ <item quantity="one">eftir <xliff:g id="COUNT_1">%d</xliff:g> ár</item> <item quantity="other">eftir <xliff:g id="COUNT_1">%d</xliff:g> ár</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="one">fyrir <xliff:g id="COUNT_1">%d</xliff:g> mínútu</item> + <item quantity="other">fyrir <xliff:g id="COUNT_1">%d</xliff:g> mínútum</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="one">fyrir <xliff:g id="COUNT_1">%d</xliff:g> klukkustund</item> + <item quantity="other">fyrir <xliff:g id="COUNT_1">%d</xliff:g> klukkustundum</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="one">fyrir <xliff:g id="COUNT_1">%d</xliff:g> degi</item> + <item quantity="other">fyrir <xliff:g id="COUNT_1">%d</xliff:g> dögum</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="one">fyrir <xliff:g id="COUNT_1">%d</xliff:g> ári</item> + <item quantity="other">fyrir <xliff:g id="COUNT_1">%d</xliff:g> árum</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="one">eftir <xliff:g id="COUNT_1">%d</xliff:g> mínútu</item> + <item quantity="other">eftir <xliff:g id="COUNT_1">%d</xliff:g> mínútur</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="one">eftir <xliff:g id="COUNT_1">%d</xliff:g> klukkustund</item> + <item quantity="other">eftir <xliff:g id="COUNT_1">%d</xliff:g> klukkustundir</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="one">eftir <xliff:g id="COUNT_1">%d</xliff:g> dag</item> + <item quantity="other">eftir <xliff:g id="COUNT_1">%d</xliff:g> daga</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="one">eftir <xliff:g id="COUNT_1">%d</xliff:g> ár</item> + <item quantity="other">eftir <xliff:g id="COUNT_1">%d</xliff:g> ár</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Vandamál með myndskeið"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Þetta myndskeið er ekki gjaldgengt fyrir straumspilun í þessu tæki."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Ekki er hægt að spila þetta myndskeið."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> stöðvaðist"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> stöðvast ítrekað"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> stöðvast ítrekað"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Endurræsa forritið"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Endurstilla og endurræsa forritið"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Opna forrit aftur"</string> <string name="aerr_report" msgid="5371800241488400617">"Senda ábendingu"</string> <string name="aerr_close" msgid="2991640326563991340">"Loka"</string> <string name="aerr_mute" msgid="1974781923723235953">"Þagga þangað til tæki er endurræst"</string> @@ -1023,7 +1054,7 @@ <string name="volume_icon_description_media" msgid="4217311719665194215">"Hljóðstyrkur efnisspilunar"</string> <string name="volume_icon_description_notification" msgid="7044986546477282274">"Hljóðstyrkur tilkynninga"</string> <string name="ringtone_default" msgid="3789758980357696936">"Sjálfgefinn hringitónn"</string> - <string name="ringtone_default_with_actual" msgid="8129563480895990372">"Sjálfgefinn hringitónn (<xliff:g id="ACTUAL_RINGTONE">%1$s</xliff:g>)"</string> + <string name="ringtone_default_with_actual" msgid="8129563480895990372">"Sjálfg. hringitónn (<xliff:g id="ACTUAL_RINGTONE">%1$s</xliff:g>)"</string> <string name="ringtone_silent" msgid="7937634392408977062">"Ekkert"</string> <string name="ringtone_picker_title" msgid="3515143939175119094">"Hringitónar"</string> <string name="ringtone_unknown" msgid="5477919988701784788">"Óþekktur hringitónn"</string> @@ -1515,7 +1546,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> eytt"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> í vinnu"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Til að taka lásinn af þessari skjámynd skaltu halda inni bakkhnappinum."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Til að taka lásinn af þessari skjámynd skaltu halda Yfirlit inni."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Forritið er fest: Ekki er hægt að losa forrit í þessu tæki."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Skjár festur"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Skjár opnaður"</string> @@ -1582,6 +1612,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS-beiðni er breytt í USSD-beiðni."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS-beiðni er breytt í nýja SS-beiðni."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Vinnusnið"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Stækka hnapp"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"stækka eða minnka"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB-tengi fyrir jaðartæki"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB-tengi fyrir jaðartæki"</string> @@ -1589,6 +1621,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Loka viðbótaratriðum"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Stækka"</string> <string name="close_button_text" msgid="3937902162644062866">"Loka"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> valið</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> valin</item> @@ -1621,4 +1655,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Núllstilltu til að nota þetta tæki án takmarkana"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Snertu til að fá frekari upplýsingar."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Slökkt <xliff:g id="LABEL">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index e96927dfecf6..e0072960dc51 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -891,6 +891,38 @@ <item quantity="other">tra <xliff:g id="COUNT_1">%d</xliff:g> a</item> <item quantity="one">tra <xliff:g id="COUNT_0">%d</xliff:g> a</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minuti fa</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minuto fa</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ore fa</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ora fa</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> giorni fa</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> giorno fa</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> anni fa</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> anno fa</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other">tra <xliff:g id="COUNT_1">%d</xliff:g> minuti</item> + <item quantity="one">tra <xliff:g id="COUNT_0">%d</xliff:g> minuto</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other">tra <xliff:g id="COUNT_1">%d</xliff:g> ore</item> + <item quantity="one">tra <xliff:g id="COUNT_0">%d</xliff:g> ora</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other">tra <xliff:g id="COUNT_1">%d</xliff:g> giorni</item> + <item quantity="one">tra <xliff:g id="COUNT_0">%d</xliff:g> giorno</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other">tra <xliff:g id="COUNT_1">%d</xliff:g> anni</item> + <item quantity="one">tra <xliff:g id="COUNT_0">%d</xliff:g> anno</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Problemi video"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Questo video non è valido per lo streaming su questo dispositivo."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Impossibile riprodurre il video."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"Il processo <xliff:g id="PROCESS">%1$s</xliff:g> si è interrotto"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"L\'app <xliff:g id="APPLICATION">%1$s</xliff:g> continua a interrompersi"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"Il processo <xliff:g id="PROCESS">%1$s</xliff:g> continua a interrompersi"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Riavvia app"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Reimposta e riavvia app"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Riapri l\'app"</string> <string name="aerr_report" msgid="5371800241488400617">"Invia feedback"</string> <string name="aerr_close" msgid="2991640326563991340">"Chiudi"</string> <string name="aerr_mute" msgid="1974781923723235953">"Disattiva fino al riavvio del dispositivo"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> eliminato"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> lavoro"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Per sbloccare questa schermata tieni premuta l\'opzione Indietro."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Per sbloccare questa schermata tieni premuta l\'opzione Panoramica."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"L\'app è bloccata. Su questo dispositivo non è consentito lo sblocco."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Schermata bloccata"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Schermata sbloccata"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"La richiesta SS è stata modificata in richiesta USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"La richiesta SS è stata modificata in nuova richiesta SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Profilo di lavoro"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Pulsante Espandi"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"attiva/disattiva l\'espansione"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Porta periferica USB Android"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"Porta periferica USB"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Chiudi overflow"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Ingrandisci"</string> <string name="close_button_text" msgid="3937902162644062866">"Chiudi"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> file selezionati</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> file selezionato</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Esegui il ripristino dei dati di fabbrica per utilizzare il dispositivo senza limitazioni"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Tocca per ulteriori informazioni."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Widget <xliff:g id="LABEL">%1$s</xliff:g> disattivato"</string> </resources> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index 29e6dec523b7..18406175c291 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -921,6 +921,54 @@ <item quantity="other">בעוד <xliff:g id="COUNT_1">%d</xliff:g> שנים</item> <item quantity="one">בעוד שנה <xliff:g id="COUNT_0">%d</xliff:g></item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="two">לפני <xliff:g id="COUNT_1">%d</xliff:g> דקות</item> + <item quantity="many">לפני <xliff:g id="COUNT_1">%d</xliff:g> דקות</item> + <item quantity="other">לפני <xliff:g id="COUNT_1">%d</xliff:g> דקות</item> + <item quantity="one">לפני <xliff:g id="COUNT_0">%d</xliff:g> דקה</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="two">לפני <xliff:g id="COUNT_1">%d</xliff:g> שעות</item> + <item quantity="many">לפני <xliff:g id="COUNT_1">%d</xliff:g> שעות</item> + <item quantity="other">לפני <xliff:g id="COUNT_1">%d</xliff:g> שעות</item> + <item quantity="one">לפני שעה <xliff:g id="COUNT_0">%d</xliff:g></item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="two">לפני <xliff:g id="COUNT_1">%d</xliff:g> ימים</item> + <item quantity="many">לפני <xliff:g id="COUNT_1">%d</xliff:g> ימים</item> + <item quantity="other">לפני <xliff:g id="COUNT_1">%d</xliff:g> ימים</item> + <item quantity="one">לפני יום <xliff:g id="COUNT_0">%d</xliff:g></item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="two">לפני <xliff:g id="COUNT_1">%d</xliff:g> שנים</item> + <item quantity="many">לפני <xliff:g id="COUNT_1">%d</xliff:g> שנים</item> + <item quantity="other">לפני <xliff:g id="COUNT_1">%d</xliff:g> שנים</item> + <item quantity="one">לפני <xliff:g id="COUNT_0">%d</xliff:g> שנה</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="two">בעוד <xliff:g id="COUNT_1">%d</xliff:g> דקות</item> + <item quantity="many">בעוד <xliff:g id="COUNT_1">%d</xliff:g> דקות</item> + <item quantity="other">בעוד <xliff:g id="COUNT_1">%d</xliff:g> דקות</item> + <item quantity="one">בעוד <xliff:g id="COUNT_0">%d</xliff:g> דקה</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="two">בעוד <xliff:g id="COUNT_1">%d</xliff:g> שעות</item> + <item quantity="many">בעוד <xliff:g id="COUNT_1">%d</xliff:g> שעות</item> + <item quantity="other">בעוד <xliff:g id="COUNT_1">%d</xliff:g> שעות</item> + <item quantity="one">בעוד <xliff:g id="COUNT_0">%d</xliff:g> שעה</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="two">בעוד <xliff:g id="COUNT_1">%d</xliff:g> ימים</item> + <item quantity="many">בעוד <xliff:g id="COUNT_1">%d</xliff:g> ימים</item> + <item quantity="other">בעוד <xliff:g id="COUNT_1">%d</xliff:g> ימים</item> + <item quantity="one">בעוד <xliff:g id="COUNT_0">%d</xliff:g> יום</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="two">בעוד <xliff:g id="COUNT_1">%d</xliff:g> שנים</item> + <item quantity="many">בעוד <xliff:g id="COUNT_1">%d</xliff:g> שנים</item> + <item quantity="other">בעוד <xliff:g id="COUNT_1">%d</xliff:g> שנים</item> + <item quantity="one">בעוד שנה <xliff:g id="COUNT_0">%d</xliff:g></item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"בעיה בווידאו"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"סרטון זה אינו חוקי להעברה כמדיה זורמת למכשיר זה."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"לא ניתן להפעיל סרטון זה."</string> @@ -992,8 +1040,7 @@ <string name="aerr_process" msgid="6201597323218674729">"התהליך <xliff:g id="PROCESS">%1$s</xliff:g> הפסיק"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"האפליקציה <xliff:g id="APPLICATION">%1$s</xliff:g> נעצרת שוב ושוב"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"האפליקציה <xliff:g id="PROCESS">%1$s</xliff:g> נעצרת שוב ושוב"</string> - <string name="aerr_restart" msgid="9001379185665886595">"הפעל מחדש את האפליקציה"</string> - <string name="aerr_reset" msgid="7645427603514220451">"אפס והפעל מחדש את האפליקציה"</string> + <string name="aerr_restart" msgid="7581308074153624475">"פתח שוב את האפליקציה"</string> <string name="aerr_report" msgid="5371800241488400617">"שלח משוב"</string> <string name="aerr_close" msgid="2991640326563991340">"סגור"</string> <string name="aerr_mute" msgid="1974781923723235953">"השתק עד הפעלה מחדש של המכשיר"</string> @@ -1550,7 +1597,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> נמחק"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"עבודה <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"כדי לבטל את הצמדת המסך הזה, לחץ לחיצה ממושכת על הלחצן \'הקודם\'."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"כדי לבטל את הצמדת המסך הזה, לחץ לחיצה ממושכת על הלחצן \'סקירה\'."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"האפליקציה מוצמדת: ביטול ההצמדה אסור במכשיר הזה."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"המסך מוצמד"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"הצמדת המסך בוטלה"</string> @@ -1633,6 +1679,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"בקשת SS שונתה לבקשת USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"בקשת SS שונתה לבקשת SS חדשה."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"פרופיל עבודה"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"לחצן הרחבה"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"החלפת מצב הרחבה"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"יציאת USB בציוד היקפי של Android"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"יציאת USB בציוד היקפי"</string> @@ -1640,6 +1688,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"סגור את האפשרויות הנוספות"</string> <string name="maximize_button_text" msgid="7543285286182446254">"הגדל"</string> <string name="close_button_text" msgid="3937902162644062866">"סגור"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="two">בחרת <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="many">בחרת <xliff:g id="COUNT_1">%1$d</xliff:g></item> @@ -1674,4 +1724,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"איפוס להגדרות היצרן כדי לאפשר שימוש במכשיר ללא מגבלות"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"גע לקבלת מידע נוסף."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> הושבת"</string> </resources> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index 9618f44d1e56..30e19506ced0 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -604,7 +604,7 @@ <string name="phoneTypeRadio" msgid="4093738079908667513">"無線"</string> <string name="phoneTypeTelex" msgid="3367879952476250512">"テレックス"</string> <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY TDD"</string> - <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"携帯電話（勤務先）"</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"携帯（勤務先）"</string> <string name="phoneTypeWorkPager" msgid="649938731231157056">"ポケベル（勤務先）"</string> <string name="phoneTypeAssistant" msgid="5596772636128562884">"アシスタント"</string> <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string> @@ -891,6 +891,38 @@ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>年</item> <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>年</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 分前</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 分前</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 時間前</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 時間前</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 日前</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 日前</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 年前</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 年前</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 分後</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 分後</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 時間後</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 時間後</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 日後</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 日後</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 年後</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 年後</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"動画の問題"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"この動画はこの端末にストリーミングできません。"</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"この動画を再生できません。"</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> が停止しました"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"「<xliff:g id="APPLICATION">%1$s</xliff:g>」が繰り返し停止しています"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"「<xliff:g id="PROCESS">%1$s</xliff:g>」が繰り返し停止しています"</string> - <string name="aerr_restart" msgid="9001379185665886595">"アプリを再起動"</string> - <string name="aerr_reset" msgid="7645427603514220451">"アプリをリセットして再起動"</string> + <string name="aerr_restart" msgid="7581308074153624475">"アプリを再起動"</string> <string name="aerr_report" msgid="5371800241488400617">"フィードバックを送信"</string> <string name="aerr_close" msgid="2991640326563991340">"閉じる"</string> <string name="aerr_mute" msgid="1974781923723235953">"端末が再起動するまでミュート"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g>を削除しました"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"仕事の<xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"この画面の固定を解除するには [戻る] を押し続けます。"</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"この画面の固定を解除するには [概要] を押し続けます。"</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"アプリは固定されています。この端末では固定を解除できません。"</string> <string name="lock_to_app_start" msgid="6643342070839862795">"画面を固定しました"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"画面固定を解除しました"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SSリクエストはUSSDリクエストに変更されました。"</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SSリクエストは新しいSSリクエストに変更されました。"</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"仕事用プロファイル"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"展開ボタン"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"展開の切り替え"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB周辺機器ポート"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB周辺機器ポート"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"オーバーフローを閉じる"</string> <string name="maximize_button_text" msgid="7543285286182446254">"最大化"</string> <string name="close_button_text" msgid="3937902162644062866">"閉じる"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g>件選択済み</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g>件選択済み</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"制限なしでこの端末を使用するには初期状態にリセットしてください"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"タップして詳細をご確認ください。"</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"停止済みの「<xliff:g id="LABEL">%1$s</xliff:g>」"</string> </resources> diff --git a/core/res/res/values-ka-rGE/strings.xml b/core/res/res/values-ka-rGE/strings.xml index c3965e866627..713b218c115c 100644 --- a/core/res/res/values-ka-rGE/strings.xml +++ b/core/res/res/values-ka-rGE/strings.xml @@ -506,7 +506,7 @@ <string name="permlab_handoverStatus" msgid="7820353257219300883">"Android სხივით გადაცემის სტატუსის მიღება"</string> <string name="permdesc_handoverStatus" msgid="4788144087245714948">"ნებას რთავს ამ აპლიკაციას, მიიღოს ინფორმაცია მიმდინარე Android Beam-ის ტრანსფერების შესახებ"</string> <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"DRM სერტიფიკატების ამოშლა"</string> - <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"საშუალებას აძლევს აპლიკაციას ამოშალოს DRM სერtიფიკატები. ეს წესით ჩვეულებრივ აპებს არ უნდა დაჭირდეს."</string> + <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"საშუალებას აძლევს აპლიკაციას ამოშალოს DRM სერტიფიკატები. ეს წესით ჩვეულებრივ აპებს არ უნდა დაჭირდეს."</string> <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"აკავშირებს შეტყობინების გაცვლის მომსახურებას"</string> <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"საშუალებას აძლევს მფლობელს შექმნას შეტყობინების გაცვლის მომსახურების უმახლესი დონის ინტერფეისი. არასდროს იქნება საჭირო ნორმალური აპლიკაციებისათვის."</string> <string name="permlab_bindCarrierServices" msgid="3233108656245526783">"ოპერატორის სერვისებთან დაკავშირება"</string> @@ -597,7 +597,7 @@ <string name="phoneTypeOther" msgid="1544425847868765990">"სხვა"</string> <string name="phoneTypeCallback" msgid="2712175203065678206">"გადმოსარეკი"</string> <string name="phoneTypeCar" msgid="8738360689616716982">"მანქანა"</string> - <string name="phoneTypeCompanyMain" msgid="540434356461478916">"კომპანიის ძირ. ნომერი"</string> + <string name="phoneTypeCompanyMain" msgid="540434356461478916">"ფირმა:მთავარი#"</string> <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string> <string name="phoneTypeMain" msgid="6766137010628326916">"მთავარი"</string> <string name="phoneTypeOtherFax" msgid="8587657145072446565">"სხვა ფაქსი"</string> @@ -891,6 +891,38 @@ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> წელში</item> <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> წელში</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> წუთის წინ</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> წუთის წინ</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> საათის წინ</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> საათის წინ</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> დღის წინ</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> დღის წინ</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> წლის წინ</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> წლის წინ</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> წუთში</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> წუთში</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> საათში</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> საათში</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> დღეში</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> დღეში</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> წელში</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> წელში</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"პრობლემები ვიდეოსთან"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"ეს ვიდეო არ გამოდგება ამ მოწყობილობაზე სტრიმინგისთვის."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"ვიდეოს დაკვრა არ არის შესაძლებელი."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> შეწყდა"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> განუწყვეტლივ ჩერდება"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> განუწყვეტლივ წყდება"</string> - <string name="aerr_restart" msgid="9001379185665886595">"აპის გადატვირთვა"</string> - <string name="aerr_reset" msgid="7645427603514220451">"გადაყენება და აპის გადატვირთვა"</string> + <string name="aerr_restart" msgid="7581308074153624475">"აპის ხელახლა გახსნა"</string> <string name="aerr_report" msgid="5371800241488400617">"გამოხმაურება"</string> <string name="aerr_close" msgid="2991640326563991340">"დახურვა"</string> <string name="aerr_mute" msgid="1974781923723235953">"დადუმება მოწყობილობის გადატვირთვამდე"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> წაიშალა"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"სამსახური <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"ამ ეკრანის ჩამაგრების მოსახსნელად, ხანგრძლივად შეეხეთ ღილაკს „უკან“."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"ამ ეკრანის ჩამაგრების მოსახსნელად, ხანგრძლივად შეეხეთ ღილაკს „მიმოხილვა“."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"აპი მიმაგრებულია: მიმაგრების მოხსნა არ არის ნებადართული ამ მოწყობილობაზე."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"ეკრანი დაფიქსირდა"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"ეკრანს ფიქსაცია მოეხსნა"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS მოთხოვნა შეიცვალა USSD მოთხოვნით."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS მოთხოვნა შეიცვალა ახალი SS მოთხოვნით."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"სამსახურის პროფილი"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"გაშლის ღილაკი"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"გაშლის გადართვა"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android-ის პერიფერიული USB პორტი"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"პერიფერიული USB პორტი"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"გადავსების დახურვა"</string> <string name="maximize_button_text" msgid="7543285286182446254">"მაქსიმალური ზომა"</string> <string name="close_button_text" msgid="3937902162644062866">"დახურვა"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> შერჩეული</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> შერჩეული</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"ამ მოწყობილობის შეზღუდვების გარეშე გამოსაყენებლად, დააბრუნეთ ქარხნული პარამეტრები"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"შეეხეთ მეტის გასაგებად."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"გათიშული <xliff:g id="LABEL">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-kk-rKZ/strings.xml b/core/res/res/values-kk-rKZ/strings.xml index 08cde3e96864..e46b9d972e4e 100644 --- a/core/res/res/values-kk-rKZ/strings.xml +++ b/core/res/res/values-kk-rKZ/strings.xml @@ -74,7 +74,7 @@ <string name="CfMmi" msgid="5123218989141573515">"Қоңырауды басқа нөмірге бағыттау"</string> <string name="CwMmi" msgid="9129678056795016867">"Күтудегі қоңырау"</string> <string name="BaMmi" msgid="455193067926770581">"Қоңырауды бөгеу"</string> - <string name="PwdMmi" msgid="7043715687905254199">"Кілтсөз өзгерту"</string> + <string name="PwdMmi" msgid="7043715687905254199">"Құпия сөз өзгерту"</string> <string name="PinMmi" msgid="3113117780361190304">"PIN өзгерту"</string> <string name="CnipMmi" msgid="3110534680557857162">"Қоңырау шалу нөмірі берілген"</string> <string name="CnirMmi" msgid="3062102121430548731">"Келген қоңырау нөмірі шектелген"</string> @@ -188,7 +188,7 @@ <string name="silent_mode" msgid="7167703389802618663">"Үнсіз режим"</string> <string name="turn_on_radio" msgid="3912793092339962371">"Сымды қосу"</string> <string name="turn_off_radio" msgid="8198784949987062346">"Сымсыз өшіру"</string> - <string name="screen_lock" msgid="799094655496098153">"Экранды бекіту"</string> + <string name="screen_lock" msgid="799094655496098153">"Экранды құлыптау"</string> <string name="power_off" msgid="4266614107412865048">"Өшіру"</string> <string name="silent_mode_silent" msgid="319298163018473078">"Қоңырау өшірулі"</string> <string name="silent_mode_vibrate" msgid="7072043388581551395">"Қоңырау тербелісі"</string> @@ -212,7 +212,7 @@ <string name="global_actions" product="tablet" msgid="408477140088053665">"Планшет опциялары"</string> <string name="global_actions" product="tv" msgid="7240386462508182976">"ТД опциялары"</string> <string name="global_actions" product="default" msgid="2406416831541615258">"Телефон опциялары"</string> - <string name="global_action_lock" msgid="2844945191792119712">"Экранды бекіту"</string> + <string name="global_action_lock" msgid="2844945191792119712">"Экранды құлыптау"</string> <string name="global_action_power_off" msgid="4471879440839879722">"Өшіру"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Вирус туралы хабарлау"</string> <string name="bugreport_title" msgid="2667494803742548533">"Қате туралы есеп құру"</string> @@ -513,7 +513,7 @@ <string name="permdesc_bindCarrierServices" msgid="1391552602551084192">"Иесіне оператор қызметтеріне қосылуға мүмкіндік береді. Қалыпты қолданбалар үшін қажет болмайды."</string> <string name="permlab_access_notification_policy" msgid="4247510821662059671">"«Мазаламау» режиміне кіру"</string> <string name="permdesc_access_notification_policy" msgid="3296832375218749580">"Қолданбаға «Мазаламау» конфигурациясын оқу және жазу мүмкіндігін береді."</string> - <string name="policylab_limitPassword" msgid="4497420728857585791">"Кілтсөз ережелерін тағайындау"</string> + <string name="policylab_limitPassword" msgid="4497420728857585791">"Құпия сөз ережелерін тағайындау"</string> <string name="policydesc_limitPassword" msgid="2502021457917874968">"Экран бекітпесінің құпия сөздерінің және PIN кодтарының ұзындығын және оларда рұқсат етілген таңбаларды басқару."</string> <string name="policylab_watchLogin" msgid="914130646942199503">"Экранды ашу әркеттерін бақылау"</string> <string name="policydesc_watchLogin" product="tablet" msgid="3215729294215070072">"Экран бекітпесін ашқан кезде терілген қате құпия сөздердің санын бақылау және планшетті бекіту немесе тым көп қате құпия сөздер терілген болса, планшеттің бүкіл деректерін өшіру."</string> @@ -522,10 +522,10 @@ <string name="policydesc_watchLogin_secondaryUser" product="tablet" msgid="4280246270601044505">"Экран бекітпесін ашқанда терілген қате құпия сөздердің санын бақылау және тым көп қате құпия сөздер терілсе, планшетті бекіту немесе осы пайдаланушының барлық деректерін өшіру."</string> <string name="policydesc_watchLogin_secondaryUser" product="TV" msgid="3484832653564483250">"Экран бекітпесін ашқанда терілген қате құпия сөздердің санын бақылау және тым көп қате құпия сөздер терілсе, теледидарды бекіту немесе осы пайдаланушының барлық деректерін өшіру."</string> <string name="policydesc_watchLogin_secondaryUser" product="default" msgid="2185480427217127147">"Экран бекітпесін ашқанда терілген қате құпия сөздердің санын бақылау және тым көп қате құпия сөздер терілсе, телефонды бекіту немесе осы пайдаланушының барлық деректерін өшіру."</string> - <string name="policylab_resetPassword" msgid="4934707632423915395">"Экран бекітпесін өзгерту"</string> - <string name="policydesc_resetPassword" msgid="1278323891710619128">"Экран бекітпесін өзгерту."</string> - <string name="policylab_forceLock" msgid="2274085384704248431">"Экранды бекіту"</string> - <string name="policydesc_forceLock" msgid="1141797588403827138">"Экранның қашан және қалай бекітілетінін басқару."</string> + <string name="policylab_resetPassword" msgid="4934707632423915395">"Экран құлпын өзгерту"</string> + <string name="policydesc_resetPassword" msgid="1278323891710619128">"Экран құлпын өзгерту."</string> + <string name="policylab_forceLock" msgid="2274085384704248431">"Экранды құлыптау"</string> + <string name="policydesc_forceLock" msgid="1141797588403827138">"Экранның қашан және қалай құлыптанатынын басқару."</string> <string name="policylab_wipeData" msgid="3910545446758639713">"Барлық деректерді өшіру"</string> <string name="policydesc_wipeData" product="tablet" msgid="4306184096067756876">"Планшет дерекқорын ескертусіз, зауыттық дерекқорын қайта реттеу арқылы өшіру."</string> <string name="policydesc_wipeData" product="tv" msgid="5816221315214527028">"Зауыттық деректерді қалпына келтіруді орындау арқылы ТД деректерін ескертусіз өшіру."</string> @@ -552,30 +552,30 @@ <item msgid="1735177144948329370">"Үй факсы"</item> <item msgid="603878674477207394">"Пейджер"</item> <item msgid="1650824275177931637">"Басқа"</item> - <item msgid="9192514806975898961">"Қалыпты"</item> + <item msgid="9192514806975898961">"Арнаулы"</item> </string-array> <string-array name="emailAddressTypes"> <item msgid="8073994352956129127">"Үй"</item> <item msgid="7084237356602625604">"Жұмыс"</item> <item msgid="1112044410659011023">"Басқа"</item> - <item msgid="2374913952870110618">"Қалыпты"</item> + <item msgid="2374913952870110618">"Арнаулы"</item> </string-array> <string-array name="postalAddressTypes"> <item msgid="6880257626740047286">"Үй"</item> <item msgid="5629153956045109251">"Жұмыс"</item> <item msgid="4966604264500343469">"Басқа"</item> - <item msgid="4932682847595299369">"Қалыпты"</item> + <item msgid="4932682847595299369">"Арнаулы"</item> </string-array> <string-array name="imAddressTypes"> <item msgid="1738585194601476694">"Үй"</item> <item msgid="1359644565647383708">"Жұмыс"</item> <item msgid="7868549401053615677">"Басқа"</item> - <item msgid="3145118944639869809">"Қалыпты"</item> + <item msgid="3145118944639869809">"Арнаулы"</item> </string-array> <string-array name="organizationTypes"> <item msgid="7546335612189115615">"Жұмыс"</item> <item msgid="4378074129049520373">"Басқа"</item> - <item msgid="3455047468583965104">"Қалыпты"</item> + <item msgid="3455047468583965104">"Арнаулы"</item> </string-array> <string-array name="imProtocols"> <item msgid="8595261363518459565">"AIM"</item> @@ -587,7 +587,7 @@ <item msgid="2506857312718630823">"ICQ"</item> <item msgid="1648797903785279353">"Jabber"</item> </string-array> - <string name="phoneTypeCustom" msgid="1644738059053355820">"Қалыпты"</string> + <string name="phoneTypeCustom" msgid="1644738059053355820">"Арнаулы"</string> <string name="phoneTypeHome" msgid="2570923463033985887">"Үй"</string> <string name="phoneTypeMobile" msgid="6501463557754751037">"Ұялы телефон"</string> <string name="phoneTypeWork" msgid="8863939667059911633">"Жұмыс"</string> @@ -595,37 +595,37 @@ <string name="phoneTypeFaxHome" msgid="2067265972322971467">"Үй факсы"</string> <string name="phoneTypePager" msgid="7582359955394921732">"Пейджер"</string> <string name="phoneTypeOther" msgid="1544425847868765990">"Басқа"</string> - <string name="phoneTypeCallback" msgid="2712175203065678206">"Кері телефон шалу нөмірі"</string> + <string name="phoneTypeCallback" msgid="2712175203065678206">"Кері тел. шалу"</string> <string name="phoneTypeCar" msgid="8738360689616716982">"Автокөлік"</string> - <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Компания негізгі"</string> - <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN (біріктірілген қызметтердің сандық желісі)"</string> + <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Компания, негізгі"</string> + <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string> <string name="phoneTypeMain" msgid="6766137010628326916">"Негізгі"</string> <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Басқа факс"</string> <string name="phoneTypeRadio" msgid="4093738079908667513">"Радио"</string> <string name="phoneTypeTelex" msgid="3367879952476250512">"Телекс"</string> - <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"Tеле тайп, есту қабілеті нашар адамдарға арналған құрал"</string> - <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Жұмыс ұялы телефоны"</string> + <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY TDD"</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Жұмыс, ұялы"</string> <string name="phoneTypeWorkPager" msgid="649938731231157056">"Жұмыс пейджері"</string> <string name="phoneTypeAssistant" msgid="5596772636128562884">"Көмек"</string> - <string name="phoneTypeMms" msgid="7254492275502768992">"MMS (мультимедиялық хабар жіберу қызметі)"</string> - <string name="eventTypeCustom" msgid="7837586198458073404">"Қалыпты"</string> + <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string> + <string name="eventTypeCustom" msgid="7837586198458073404">"Арнаулы"</string> <string name="eventTypeBirthday" msgid="2813379844211390740">"Туған күн"</string> <string name="eventTypeAnniversary" msgid="3876779744518284000">"Мерейтой"</string> <string name="eventTypeOther" msgid="7388178939010143077">"Басқа"</string> - <string name="emailTypeCustom" msgid="8525960257804213846">"Қалыпты"</string> + <string name="emailTypeCustom" msgid="8525960257804213846">"Арнаулы"</string> <string name="emailTypeHome" msgid="449227236140433919">"Үй"</string> <string name="emailTypeWork" msgid="3548058059601149973">"Жұмыс"</string> <string name="emailTypeOther" msgid="2923008695272639549">"Басқа"</string> <string name="emailTypeMobile" msgid="119919005321166205">"Ұялы"</string> - <string name="postalTypeCustom" msgid="8903206903060479902">"Қалыпты"</string> + <string name="postalTypeCustom" msgid="8903206903060479902">"Арнаулы"</string> <string name="postalTypeHome" msgid="8165756977184483097">"Үй"</string> <string name="postalTypeWork" msgid="5268172772387694495">"Жұмыс"</string> <string name="postalTypeOther" msgid="2726111966623584341">"Басқа"</string> - <string name="imTypeCustom" msgid="2074028755527826046">"Қалыпты"</string> + <string name="imTypeCustom" msgid="2074028755527826046">"Арнаулы"</string> <string name="imTypeHome" msgid="6241181032954263892">"Үй"</string> <string name="imTypeWork" msgid="1371489290242433090">"Жұмыс"</string> <string name="imTypeOther" msgid="5377007495735915478">"Басқа"</string> - <string name="imProtocolCustom" msgid="6919453836618749992">"Қалыпты"</string> + <string name="imProtocolCustom" msgid="6919453836618749992">"Арнаулы"</string> <string name="imProtocolAim" msgid="7050360612368383417">"AIM"</string> <string name="imProtocolMsn" msgid="144556545420769442">"Windows Live"</string> <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string> @@ -637,8 +637,8 @@ <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string> <string name="orgTypeWork" msgid="29268870505363872">"Жұмыс"</string> <string name="orgTypeOther" msgid="3951781131570124082">"Басқа"</string> - <string name="orgTypeCustom" msgid="225523415372088322">"Қалыпты"</string> - <string name="relationTypeCustom" msgid="3542403679827297300">"Қалыпты"</string> + <string name="orgTypeCustom" msgid="225523415372088322">"Арнаулы"</string> + <string name="relationTypeCustom" msgid="3542403679827297300">"Арнаулы"</string> <string name="relationTypeAssistant" msgid="6274334825195379076">"Көмекші"</string> <string name="relationTypeBrother" msgid="8757913506784067713">"Аға-іні"</string> <string name="relationTypeChild" msgid="1890746277276881626">"Бала"</string> @@ -653,7 +653,7 @@ <string name="relationTypeRelative" msgid="1799819930085610271">"Туыс"</string> <string name="relationTypeSister" msgid="1735983554479076481">"Әпке/сіңлі/қарындас"</string> <string name="relationTypeSpouse" msgid="394136939428698117">"Жұбай"</string> - <string name="sipAddressTypeCustom" msgid="2473580593111590945">"Қалыпты"</string> + <string name="sipAddressTypeCustom" msgid="2473580593111590945">"Арнаулы"</string> <string name="sipAddressTypeHome" msgid="6093598181069359295">"Үй"</string> <string name="sipAddressTypeWork" msgid="6920725730797099047">"Жұмыс"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"Басқа"</string> @@ -718,7 +718,7 @@ <string name="lockscreen_glogin_too_many_attempts" msgid="2751368605287288808">"Тым көп кескін әрекеттері"</string> <string name="lockscreen_glogin_instructions" msgid="3931816256100707784">"Ашу үшін Google есептік жазбаңызбен кіріңіз."</string> <string name="lockscreen_glogin_username_hint" msgid="8846881424106484447">"Пайдаланушы атауы (эл. пошта)"</string> - <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Кілтсөз"</string> + <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Құпия сөз"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Кіру"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Пайдаланушы атауы немесе кілтсөз жарамсыз."</string> <string name="lockscreen_glogin_account_recovery_hint" msgid="1696924763690379073">"Пайдаланушы атауын немесе кілтсөзді ұмытып қалдыңыз ба?\n"<b>"google.com/accounts/recovery"</b>" веб-сайтына кірісіңіз."</string> @@ -750,7 +750,7 @@ <string name="keyguard_accessibility_pattern_unlock" msgid="1490840706075246612">"Кескін арқылы ашу."</string> <string name="keyguard_accessibility_face_unlock" msgid="4817282543351718535">"Бет-әлпет арқылы ашу."</string> <string name="keyguard_accessibility_pin_unlock" msgid="2469687111784035046">"Pin арқылы ашу."</string> - <string name="keyguard_accessibility_password_unlock" msgid="7675777623912155089">"Кілтсөз арқылы ашу."</string> + <string name="keyguard_accessibility_password_unlock" msgid="7675777623912155089">"Құпия сөз арқылы ашу."</string> <string name="keyguard_accessibility_pattern_area" msgid="7679891324509597904">"Кескін арқылы ашу аймағы."</string> <string name="keyguard_accessibility_slide_area" msgid="6736064494019979544">"Сырғыту аймағы."</string> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> @@ -891,6 +891,38 @@ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ж.</item> <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ж.</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> минут бұрын</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> минут бұрын</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> сағат бұрын</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> сағат бұрын</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> күн бұрын</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> күн бұрын</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> жыл бұрын</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> жыл бұрын</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> минутта</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> минутта</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> сағатта</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> сағатта</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> күнде</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> күнде</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> жылда</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> жылда</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Бейне ақаулығы"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Бұл бейне осы құрылғыға ағынын жіберуге жарамсыз."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Бұл бейне таспаны ойната алмайды."</string> @@ -926,7 +958,7 @@ <string name="ok" msgid="5970060430562524910">"Жарайды"</string> <string name="cancel" msgid="6442560571259935130">"Бас тарту"</string> <string name="yes" msgid="5362982303337969312">"Жарайды"</string> - <string name="no" msgid="5141531044935541497">"Өшіру"</string> + <string name="no" msgid="5141531044935541497">"Бас тарту"</string> <string name="dialog_alert_title" msgid="2049658708609043103">"Назар аударыңыз"</string> <string name="loading" msgid="7933681260296021180">"Жүктелуде…"</string> <string name="capital_on" msgid="1544682755514494298">"Қосулы"</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> тоқтады"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> тоқтай береді"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> тоқтай береді"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Қолданбаны қайта іске қосу"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Ысырып, қолданбаны қайта іске қосу"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Қолданбаны қайта ашу"</string> <string name="aerr_report" msgid="5371800241488400617">"Пікір жіберу"</string> <string name="aerr_close" msgid="2991640326563991340">"Жабу"</string> <string name="aerr_mute" msgid="1974781923723235953">"Құрылғы қайта іске қосылғанша дыбысын өшіру"</string> @@ -1022,8 +1053,8 @@ <string name="volume_icon_description_incall" msgid="8890073218154543397">"Қоңырау дыбысының қаттылығы"</string> <string name="volume_icon_description_media" msgid="4217311719665194215">"Meдиа дыбысының қаттылығы"</string> <string name="volume_icon_description_notification" msgid="7044986546477282274">"Хабар дыбысының қаттылығы"</string> - <string name="ringtone_default" msgid="3789758980357696936">"Бастапқы қоңырау әуені"</string> - <string name="ringtone_default_with_actual" msgid="8129563480895990372">"Бастапқы қоңырау әуені (<xliff:g id="ACTUAL_RINGTONE">%1$s</xliff:g>)"</string> + <string name="ringtone_default" msgid="3789758980357696936">"Әдепкі рингтон"</string> + <string name="ringtone_default_with_actual" msgid="8129563480895990372">"Әдепкі рингтон (<xliff:g id="ACTUAL_RINGTONE">%1$s</xliff:g>)"</string> <string name="ringtone_silent" msgid="7937634392408977062">"Ешқандай"</string> <string name="ringtone_picker_title" msgid="3515143939175119094">"Қоңырау әуендері"</string> <string name="ringtone_unknown" msgid="5477919988701784788">"Белгісіз қоңырау әуені"</string> @@ -1259,7 +1290,7 @@ <string name="date_picker_prev_month_button" msgid="2858244643992056505">"Алдыңғы ай"</string> <string name="date_picker_next_month_button" msgid="5559507736887605055">"Келесі ай"</string> <string name="keyboardview_keycode_alt" msgid="4856868820040051939">"Alt"</string> - <string name="keyboardview_keycode_cancel" msgid="1203984017245783244">"Өшіру"</string> + <string name="keyboardview_keycode_cancel" msgid="1203984017245783244">"Жабу"</string> <string name="keyboardview_keycode_delete" msgid="3337914833206635744">"Жою"</string> <string name="keyboardview_keycode_done" msgid="1992571118466679775">"Дайын"</string> <string name="keyboardview_keycode_mode_change" msgid="4547387741906537519">"Режим өзгерту"</string> @@ -1271,7 +1302,7 @@ <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"<xliff:g id="APPLICATION_NAME">%s</xliff:g> қолданбасымен бөлісу"</string> <string name="content_description_sliding_handle" msgid="415975056159262248">"Сырғитын тұтқа. Түртіп, ұстап тұрыңыз."</string> <string name="description_target_unlock_tablet" msgid="3833195335629795055">"Бекітпесін ашу үшін сипап өтіңіз."</string> - <string name="keyboard_headset_required_to_hear_password" msgid="7011927352267668657">"Кілтсөз пернелерін есту үшін құлақаспапты қосыңыз."</string> + <string name="keyboard_headset_required_to_hear_password" msgid="7011927352267668657">"Құпия сөз пернелерін есту үшін құлақаспапты қосыңыз."</string> <string name="keyboard_password_character_no_headset" msgid="2859873770886153678">"Нүкте."</string> <string name="action_bar_home_description" msgid="5293600496601490216">"Негізгі бетте жылжу"</string> <string name="action_bar_up_description" msgid="2237496562952152589">"Жоғары қарай жылжу"</string> @@ -1302,10 +1333,10 @@ <string name="ssl_certificate" msgid="6510040486049237639">"Қауіпсіздік сертификаты"</string> <string name="ssl_certificate_is_valid" msgid="6825263250774569373">"Бұл сертификат жарамды."</string> <string name="issued_to" msgid="454239480274921032">"Кімге берілген:"</string> - <string name="common_name" msgid="2233209299434172646">"Ортақ атауы:"</string> + <string name="common_name" msgid="2233209299434172646">"Стандартты атауы:"</string> <string name="org_name" msgid="6973561190762085236">"Ұйым:"</string> <string name="org_unit" msgid="7265981890422070383">"Ұйым бірлігі:"</string> - <string name="issued_by" msgid="2647584988057481566">"Басып шығарған:"</string> + <string name="issued_by" msgid="2647584988057481566">"Берген:"</string> <string name="validity_period" msgid="8818886137545983110">"Жарамдылығы:"</string> <string name="issued_on" msgid="5895017404361397232">"Шығарылу мезгілі:"</string> <string name="expires_on" msgid="3676242949915959821">"Мерзімі аяқталатын күн:"</string> @@ -1368,7 +1399,7 @@ <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Тым көп кескін әрекеттері"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Ашу үшін Google есептік жазбасы арқылы кіріңіз."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Пайдаланушы атауы (эл. пошта)"</string> - <string name="kg_login_password_hint" msgid="9057289103827298549">"Кілтсөз"</string> + <string name="kg_login_password_hint" msgid="9057289103827298549">"Құпия сөз"</string> <string name="kg_login_submit_button" msgid="5355904582674054702">"Кіру"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Пайдаланушы атауы немесе кілтсөз жарамсыз."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Пайдаланушы атауын немесе кілтсөзді ұмытып қалдыңыз ба?\n"<b>"google.com/accounts/recovery"</b>" веб-сайтына кіріңіз."</string> @@ -1394,7 +1425,7 @@ <string name="user_switched" msgid="3768006783166984410">"Ағымдағы пайдаланушы <xliff:g id="NAME">%1$s</xliff:g>."</string> <string name="user_switching_message" msgid="2871009331809089783">"<xliff:g id="NAME">%1$s</xliff:g> ауысу орындалуда…"</string> <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g> ішінен шығу…"</string> - <string name="owner_name" msgid="2716755460376028154">"Пайдаланушы"</string> + <string name="owner_name" msgid="2716755460376028154">"Құрылғы иесі"</string> <string name="error_message_title" msgid="4510373083082500195">"Қателік"</string> <string name="error_message_change_not_allowed" msgid="1347282344200417578">"Бұл өзгертуге әкімші рұқсат етпеген"</string> <string name="app_not_found" msgid="3429141853498927379">"Бұл әрекетті орындайтын қолданба табылмады"</string> @@ -1515,7 +1546,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> жойылды"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"Жұмыс <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Осы экранды босату үшін \"Артқа\" түймесін басып тұрыңыз."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Осы экранды босату үшін \"Шолу\" түймесін басып тұрыңыз."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Бағдарлама белгіленді: Бұл құрылғыда белгіні алуға рұқсат берілмейді."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Экран түйрелді"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Экран босатылды"</string> @@ -1582,6 +1612,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS сұрауы USSD сұрауына өзгертілді."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS сұрауы жаңа SS сұрауына өзгертілді."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Жұмыс профилі"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Жаю түймесі"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"жаюды ажырата қосу"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB перифериялық порты"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB перифериялық порты"</string> @@ -1589,6 +1621,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Артық толуды жабу"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Жазу"</string> <string name="close_button_text" msgid="3937902162644062866">"Жабу"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> таңдалды</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> таңдалды</item> @@ -1621,4 +1655,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Осы құрылғыны шектеусіз пайдалану үшін зауыттық параметрлерді қалпына келтіріңіз"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Қосымша мәліметтер алу үшін түртіңіз."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> өшірулі"</string> </resources> diff --git a/core/res/res/values-km-rKH/strings.xml b/core/res/res/values-km-rKH/strings.xml index 2ac5017f829f..4dd3828eb004 100644 --- a/core/res/res/values-km-rKH/strings.xml +++ b/core/res/res/values-km-rKH/strings.xml @@ -891,6 +891,38 @@ <item quantity="other">ក្នុងពេល <xliff:g id="COUNT_1">%d</xliff:g>ឆ</item> <item quantity="one">ក្នុងពេល <xliff:g id="COUNT_0">%d</xliff:g>ឆ</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> នាទីមុន</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> នាទីមុន</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ម៉ោងមុន</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ម៉ោងមុន</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ថ្ងៃមុន</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ថ្ងៃមុន</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ឆ្នាំមុន</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ឆ្នាំមុន</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other">ក្នុងរយៈពេល <xliff:g id="COUNT_1">%d</xliff:g> នាទីទៀត</item> + <item quantity="one">ក្នុងរយៈពេល <xliff:g id="COUNT_0">%d</xliff:g> នាទីទៀត</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other">ក្នុងរយៈពេល <xliff:g id="COUNT_1">%d</xliff:g> ម៉ោងទៀត</item> + <item quantity="one">ក្នុងរយៈពេល <xliff:g id="COUNT_0">%d</xliff:g> ម៉ោងទៀត</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other">ក្នុងរយៈពេល <xliff:g id="COUNT_1">%d</xliff:g> ថ្ងៃទៀត</item> + <item quantity="one">ក្នុងរយៈពេល <xliff:g id="COUNT_0">%d</xliff:g> ថ្ងៃទៀត</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other">ក្នុងរយៈពេល <xliff:g id="COUNT_1">%d</xliff:g> ឆ្នាំទៀត</item> + <item quantity="one">ក្នុងរយៈពេល <xliff:g id="COUNT_0">%d</xliff:g> ឆ្នាំទៀត</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"បញ្ហាវីដេអូ"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"វីដេអូនេះមិនត្រឹមត្រូវសម្រាប់ចរន្តចូលឧបករណ៍នេះ។"</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"មិនអាចចាក់វីដេអូនេះ។"</string> @@ -964,8 +996,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> បានឈប់"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> ឈប់ដំណើរការម្តងហើយម្តងទៀត"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> ឈប់ដំណើរការម្តងហើយម្តងទៀត"</string> - <string name="aerr_restart" msgid="9001379185665886595">"ចាប់ផ្តើមកម្មវិធីឡើងវិញ"</string> - <string name="aerr_reset" msgid="7645427603514220451">"កំណត់ និងចាប់ផ្តើមកម្មវិធីឡើងវិញ"</string> + <string name="aerr_restart" msgid="7581308074153624475">"បើកកម្មវិធីម្តងទៀត"</string> <string name="aerr_report" msgid="5371800241488400617">"ផ្ញើមតិ"</string> <string name="aerr_close" msgid="2991640326563991340">"បិទ"</string> <string name="aerr_mute" msgid="1974781923723235953">"បិទរហូតដល់ឧបករណ៍ចាប់ផ្តើមឡើងវិញ"</string> @@ -1514,7 +1545,6 @@ <string name="deleted_key" msgid="7659477886625566590">"បានលុប <xliff:g id="KEY">%1$s</xliff:g>"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"កន្លែងធ្វើការ <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"ដើម្បីផ្តាច់អេក្រង់នេះ សូមប៉ះ និងសង្កត់ប៊ូតុងថយក្រោយឲ្យជាប់។"</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"ដើម្បីផ្តាច់អេក្រង់នេះ សូមប៉ះ និងសង្កត់ប៊ូតុងទិដ្ឋភាពឲ្យជាប់។"</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"កម្មវិធីនេះត្រូវបានខ្ទាស់។ មិនអនុញ្ញាតឲ្យដោះការខ្ទាស់នៅលើឧបករណ៍នេះទេ។"</string> <string name="lock_to_app_start" msgid="6643342070839862795">"បានភ្ជាប់អេក្រង់"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"មិនបានភ្ជាប់អេក្រង់"</string> @@ -1525,7 +1555,7 @@ <string name="package_updated_device_owner" msgid="8856631322440187071">"បានធ្វើបច្ចុប្បន្នភាពដោយអ្នកគ្រប់គ្រងរបស់អ្នក"</string> <string name="package_deleted_device_owner" msgid="7650577387493101353">"បានលុបដោយអ្នកគ្រប់គ្រងរបស់អ្នក"</string> <string name="battery_saver_description" msgid="1960431123816253034">"ដើម្បីជួយឲ្យថាមពលថ្មប្រសើរឡើង កម្មវិធីសន្សំសំចៃថាមពលថ្មកាត់បន្ថយប្រតិបត្តិការឧបករណ៍របស់អ្នក និងកម្រិតភាពញ័រ សេវាកម្មទីតាំង និងទិន្នន័យផ្ទៃខាងក្រោយស្ទើរតែទាំងអស់។ ការផ្ញើសារអ៊ីម៉ែល និងកម្មវិធីផ្សេងទៀតដែលពឹងផ្អែកលើការធ្វើសមកាលកម្មអាចនឹងមិនធ្វើបច្ចុប្បន្នភាពទេ លុះត្រាតែអ្នកបើកពួកវា។\n\nកម្មវិធីសន្សំសំចៃបិទដោយស្វ័យប្រវត្តិ នៅពេលដែលឧបករណ៍របស់អ្នកកំពុងសាកថ្ម។"</string> - <string name="data_saver_description" msgid="6015391409098303235">"ដើម្បីជួយកាត់បន្ថយការប្រើប្រាស់ទិន្នន័យ កម្មវិធីសន្សំសំចៃទិន្នន័យរារាំងកម្មវិធីមួយចំនួនមិនឲ្យផ្ញើ ឬទទួលទិន្នន័យនៅផ្ទៃខាងក្រោយ។ កម្មវិធីដែលអ្នកកំពុងប្រើនាពេលបច្ចុប្បន្នអាចចូលដំណើរការទិន្នន័យបាន ប៉ុន្តែវាអាចនឹងមិនធ្វើដូចនេះញឹកញាប់ទេ។ នេះមានន័យថា ជាឧទាហរណ៍ រូបភាពមិនបង្ហាញនោះទេ រហូតទាល់តែអ្នកប៉ះពួកវា។"</string> + <string name="data_saver_description" msgid="6015391409098303235">"ដើម្បីជួយកាត់បន្ថយការប្រើប្រាស់ទិន្នន័យ កម្មវិធីសន្សំសំចៃទិន្នន័យរារាំងកម្មវិធីមួយចំនួនមិនឲ្យបញ្ជូន ឬទទួលទិន្នន័យនៅផ្ទៃខាងក្រោយទេ។ កម្មវិធីដែលអ្នកកំពុងប្រើនាពេលបច្ចុប្បន្នអាចចូលប្រើប្រាស់ទិន្នន័យបាន ប៉ុន្តែអាចនឹងមិនញឹកញាប់ដូចមុនទេ។ ឧទាហរណ៍ រូបភាពមិនបង្ហាញទេ លុះត្រាតែអ្នកប៉ះរូបភាពទាំងនោះ។"</string> <string name="data_saver_enable_title" msgid="4674073932722787417">"បើកកម្មវិធីសន្សំសំចៃទិន្នន័យឬ?"</string> <string name="data_saver_enable_button" msgid="7147735965247211818">"បើក"</string> <plurals name="zen_mode_duration_minutes_summary" formatted="false" msgid="4367877408072000848"> @@ -1581,6 +1611,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"សំណើរ SS ត្រូវបានកែសម្រួលទៅតាមសំណើរ USSD។"</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"សំណើរ SS ត្រូវបានកែសម្រួលទៅតាមសំណើរ SS ថ្មី។"</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"ប្រវត្តិរូបការងារ"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"ប៊ូតុងពង្រីក"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"បិទ/បើកការពង្រីក"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"ឧបករណ៍រន្ធ USB Android បន្ថែម"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"ឧបករណ៍រន្ធ USB បន្ថែម"</string> @@ -1588,6 +1620,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"បិទលើសចំណុះ"</string> <string name="maximize_button_text" msgid="7543285286182446254">"ពង្រីក"</string> <string name="close_button_text" msgid="3937902162644062866">"បិទ"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other">បានជ្រើស <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="one">បានជ្រើស <xliff:g id="COUNT_0">%1$d</xliff:g></item> @@ -1620,4 +1654,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"កំណត់ដូចចេញពីរោងចក្រឡើងវិញដើម្បីប្រើឧបករណ៍នេះដោយគ្មានការរឹតបន្តឹង"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"ប៉ះ ដើម្បីស្វែងយល់បន្ថែម។"</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> ដែលបានបិទដំណើរការ"</string> </resources> diff --git a/core/res/res/values-kn-rIN/strings.xml b/core/res/res/values-kn-rIN/strings.xml index be9ded7a013f..58f8cfdc889f 100644 --- a/core/res/res/values-kn-rIN/strings.xml +++ b/core/res/res/values-kn-rIN/strings.xml @@ -51,7 +51,7 @@ <string name="serviceDisabled" msgid="1937553226592516411">"ಸೇವೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ."</string> <string name="serviceRegistered" msgid="6275019082598102493">"ನೋಂದಣಿ ಯಶಸ್ವಿಯಾಗಿದೆ."</string> <string name="serviceErased" msgid="1288584695297200972">"ಅಳಿಸುವಿಕೆ ಯಶಸ್ವಿಯಾಗಿದೆ."</string> - <string name="passwordIncorrect" msgid="7612208839450128715">"ತಪ್ಪಾದ ಪಾಸ್ವರ್ಡ್."</string> + <string name="passwordIncorrect" msgid="7612208839450128715">"ತಪ್ಪು ಪಾಸ್ವರ್ಡ್."</string> <string name="mmiComplete" msgid="8232527495411698359">"MMI ಪೂರ್ಣಗೊಂಡಿದೆ."</string> <string name="badPin" msgid="9015277645546710014">"ನೀವು ಟೈಪ್ ಮಾಡಿದ ಹಳೆಯ ಪಿನ್ ಸರಿಯಾಗಿಲ್ಲ."</string> <string name="badPuk" msgid="5487257647081132201">"ನೀವು ಟೈಪ್ ಮಾಡಿದ PUK ಸರಿಯಾಗಿಲ್ಲ."</string> @@ -82,10 +82,10 @@ <string name="RuacMmi" msgid="7827887459138308886">"ಅನಪೇಕ್ಷಿತ ಕಿರಿಕಿರಿ ಮಾಡುವ ಕರೆಗಳ ತಿರಸ್ಕಾರ"</string> <string name="CndMmi" msgid="3116446237081575808">"ಕರೆ ಮಾಡುವ ಸಂಖ್ಯೆಯ ವಿತರಣೆ"</string> <string name="DndMmi" msgid="1265478932418334331">"ಅಡಚಣೆ ಮಾಡಬೇಡ"</string> - <string name="CLIRDefaultOnNextCallOn" msgid="429415409145781923">"ಕರೆಮಾಡುವವರ ID ಅನ್ನು ನಿರ್ಬಂಧಿಸುವಂತೆ ಡೀಫಾಲ್ಟ್ ಮಾಡಲಾಗಿದೆ. ಮುಂದಿನ ಕರೆ: ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string> - <string name="CLIRDefaultOnNextCallOff" msgid="3092918006077864624">"ಕರೆಮಾಡುವವರ ID ಅನ್ನು ನಿರ್ಬಂಧಿಸುವಂತೆ ಡೀಫಾಲ್ಟ್ ಮಾಡಲಾಗಿದೆ. ಮುಂದಿನ ಕರೆ: ನಿರ್ಬಂಧಿಸಿಲ್ಲ"</string> - <string name="CLIRDefaultOffNextCallOn" msgid="6179425182856418465">"ಕರೆಮಾಡುವವರ ID ಅನ್ನು ನಿರ್ಬಂಧಿಸದಿರುವಂತೆ ಡೀಫಾಲ್ಟ್ ಮಾಡಲಾಗಿದೆ. ಮುಂದಿನ ಕರೆ: ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string> - <string name="CLIRDefaultOffNextCallOff" msgid="2567998633124408552">"ಕರೆಮಾಡುವವರ ID ಅನ್ನು ನಿರ್ಬಂಧಿಸದಿರುವಂತೆ ಡೀಫಾಲ್ಟ್ ಮಾಡಲಾಗಿದೆ. ಮುಂದಿನ ಕರೆ: ನಿರ್ಬಂಧಿಸಲಾಗಿಲ್ಲ"</string> + <string name="CLIRDefaultOnNextCallOn" msgid="429415409145781923">"ಕರೆಮಾಡುವವರ ID ಅನ್ನು ನಿರ್ಬಂಧಿಸುವಂತೆ ಡಿಫಾಲ್ಟ್ ಮಾಡಲಾಗಿದೆ. ಮುಂದಿನ ಕರೆ: ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string> + <string name="CLIRDefaultOnNextCallOff" msgid="3092918006077864624">"ಕರೆಮಾಡುವವರ ID ಅನ್ನು ನಿರ್ಬಂಧಿಸುವಂತೆ ಡಿಫಾಲ್ಟ್ ಮಾಡಲಾಗಿದೆ. ಮುಂದಿನ ಕರೆ: ನಿರ್ಬಂಧಿಸಿಲ್ಲ"</string> + <string name="CLIRDefaultOffNextCallOn" msgid="6179425182856418465">"ಕರೆಮಾಡುವವರ ID ಅನ್ನು ನಿರ್ಬಂಧಿಸದಿರುವಂತೆ ಡಿಫಾಲ್ಟ್ ಮಾಡಲಾಗಿದೆ. ಮುಂದಿನ ಕರೆ: ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string> + <string name="CLIRDefaultOffNextCallOff" msgid="2567998633124408552">"ಕರೆಮಾಡುವವರ ID ಅನ್ನು ನಿರ್ಬಂಧಿಸದಿರುವಂತೆ ಡಿಫಾಲ್ಟ್ ಮಾಡಲಾಗಿದೆ. ಮುಂದಿನ ಕರೆ: ನಿರ್ಬಂಧಿಸಲಾಗಿಲ್ಲ"</string> <string name="serviceNotProvisioned" msgid="8614830180508686666">"ಸೇವೆಯನ್ನು ಪೂರೈಸಲಾಗಿಲ್ಲ."</string> <string name="CLIRPermanent" msgid="3377371145926835671">"ನೀವು ಕಾಲರ್ ID ಸೆಟ್ಟಿಂಗ್ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string> <string name="RestrictedOnData" msgid="8653794784690065540">"ಡೇಟಾ ಸೇವೆಯನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ."</string> @@ -122,21 +122,21 @@ <string name="roamingText11" msgid="4154476854426920970">"ರೋಮಿಂಗ್ ಬ್ಯಾನರ್ ಆನ್ ಆಗಿದೆ"</string> <string name="roamingText12" msgid="1189071119992726320">"ರೋಮಿಂಗ್ ಬ್ಯಾನರ್ ಆಫ್ ಆಗಿದೆ"</string> <string name="roamingTextSearching" msgid="8360141885972279963">"ಸೇವೆ ಹುಡುಕಲಾಗುತ್ತಿದೆ"</string> - <string name="wfcRegErrorTitle" msgid="2301376280632110664">"Wi-Fi ಕರೆ ಮಾಡುವಿಕೆ"</string> + <string name="wfcRegErrorTitle" msgid="2301376280632110664">"ವೈ-ಫೈ ಕರೆ ಮಾಡುವಿಕೆ"</string> <string-array name="wfcOperatorErrorAlertMessages"> - <item msgid="2254967670088539682">"Wi-Fi ಬಳಸಿಕೊಂಡು ಕರೆ ಮಾಡಲು ಮತ್ತು ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸಲು, ಮೊದಲು ಈ ಸಾಧನವನ್ನು ಹೊಂದಿಸಲು ನಿಮ್ಮ ವಾಹಕವನ್ನು ಕೇಳಿ. ತದನಂತರ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಮತ್ತೆ Wi-Fi ಆನ್ ಮಾಡಿ."</item> + <item msgid="2254967670088539682">"ವೈ-ಫೈ ಬಳಸಿಕೊಂಡು ಕರೆ ಮಾಡಲು ಮತ್ತು ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸಲು, ಮೊದಲು ಈ ಸಾಧನವನ್ನು ಹೊಂದಿಸಲು ನಿಮ್ಮ ವಾಹಕವನ್ನು ಕೇಳಿ. ತದನಂತರ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಮತ್ತೆ ವೈ-ಫೈ ಆನ್ ಮಾಡಿ."</item> </string-array> <string-array name="wfcOperatorErrorNotificationMessages"> <item msgid="6177300162212449033">"ನಿಮ್ಮ ವಾಹಕದಲ್ಲಿ ನೋಂದಾಯಿಸಿಕೊಳ್ಳಿ"</item> </string-array> <string-array name="wfcSpnFormats"> <item msgid="6830082633573257149">"%s"</item> - <item msgid="4397097370387921767">"%s Wi-Fi ಕರೆ ಮಾಡುವಿಕೆ"</item> + <item msgid="4397097370387921767">"%s ವೈ-ಫೈ ಕರೆ ಮಾಡುವಿಕೆ"</item> </string-array> <string name="wifi_calling_off_summary" msgid="8720659586041656098">"ಆಫ್"</string> <string name="wfc_mode_wifi_preferred_summary" msgid="1994113411286935263">"ವೈ-ಫೈಗೆ ಆದ್ಯತೆ ನೀಡಲಾಗಿದೆ"</string> <string name="wfc_mode_cellular_preferred_summary" msgid="5920549484600758786">"ಸೆಲ್ಯುಲಾರ್ಗೆ ಆದ್ಯತೆ ನೀಡಲಾಗಿದೆ"</string> - <string name="wfc_mode_wifi_only_summary" msgid="2379919155237869320">"Wi-Fi ಮಾತ್ರ"</string> + <string name="wfc_mode_wifi_only_summary" msgid="2379919155237869320">"ವೈ-ಫೈ ಮಾತ್ರ"</string> <string name="cfTemplateNotForwarded" msgid="1683685883841272560">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: ಫಾರ್ವರ್ಡ್ ಮಾಡಲಾಗಿಲ್ಲ"</string> <string name="cfTemplateForwarded" msgid="1302922117498590521">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string> <string name="cfTemplateForwardedTime" msgid="9206251736527085256">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="TIME_DELAY">{2}</xliff:g> ಸೆಕೆಂಡುಗಳ ನಂತರ <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string> @@ -188,7 +188,7 @@ <string name="silent_mode" msgid="7167703389802618663">"ಶಾಂತ ಮೋಡ್"</string> <string name="turn_on_radio" msgid="3912793092339962371">"ವೈರ್ಲೆಸ್ ಆನ್ ಮಾಡು"</string> <string name="turn_off_radio" msgid="8198784949987062346">"ವೈರ್ಲೆಸ್ ಆಫ್ ಮಾಡು"</string> - <string name="screen_lock" msgid="799094655496098153">"ಪರದೆ ಲಾಕ್"</string> + <string name="screen_lock" msgid="799094655496098153">"ಸ್ಕ್ರೀನ್ ಲಾಕ್"</string> <string name="power_off" msgid="4266614107412865048">"ಪವರ್ ಆಫ್ ಮಾಡು"</string> <string name="silent_mode_silent" msgid="319298163018473078">"ರಿಂಗರ್ ಆಫ್"</string> <string name="silent_mode_vibrate" msgid="7072043388581551395">"ರಿಂಗರ್ ವೈಬ್ರೇಷನ್"</string> @@ -212,7 +212,7 @@ <string name="global_actions" product="tablet" msgid="408477140088053665">"ಟ್ಯಾಬ್ಲೆಟ್ ಆಯ್ಕೆಗಳು"</string> <string name="global_actions" product="tv" msgid="7240386462508182976">"ಟಿವಿ ಆಯ್ಕೆಗಳು"</string> <string name="global_actions" product="default" msgid="2406416831541615258">"ಫೋನ್ ಆಯ್ಕೆಗಳು"</string> - <string name="global_action_lock" msgid="2844945191792119712">"ಪರದೆ ಲಾಕ್"</string> + <string name="global_action_lock" msgid="2844945191792119712">"ಸ್ಕ್ರೀನ್ ಲಾಕ್"</string> <string name="global_action_power_off" msgid="4471879440839879722">"ಪವರ್ ಆಫ್ ಮಾಡು"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"ದೋಷದ ವರದಿ"</string> <string name="bugreport_title" msgid="2667494803742548533">"ದೋಷ ವರದಿ ರಚಿಸಿ"</string> @@ -306,8 +306,8 @@ <string name="permdesc_manageProfileAndDeviceOwners" msgid="106894851498657169">"ಪ್ರೊಫೈಲ್ ಮಾಲೀಕರು ಮತ್ತು ಸಾಧನ ಮಾಲೀಕರನ್ನು ಹೊಂದಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗಳನ್ನು ಅನುಮತಿಸುತ್ತದೆ."</string> <string name="permlab_reorderTasks" msgid="2018575526934422779">"ರನ್ ಆಗುತ್ತಿರುವ ಅಪ್ಲಿಕೇಶನ್ಗಳನ್ನು ಮರುಕ್ರಮಗೊಳಿಸಿ"</string> <string name="permdesc_reorderTasks" msgid="7734217754877439351">"ಮುನ್ನೆಲೆ ಮತ್ತು ಹಿನ್ನಲೆಗೆ ಕಾರ್ಯಗಳನ್ನು ಸರಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ. ನಿಮ್ಮ ಇನ್ಪುಟ್ ಇಲ್ಲದೆಯೇ, ಅಪ್ಲಿಕೇಶನ್ ಈ ಕಾರ್ಯವನ್ನು ಮಾಡಬಹುದು."</string> - <string name="permlab_enableCarMode" msgid="5684504058192921098">"ಕಾರ್ ಮೋಡ್ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string> - <string name="permdesc_enableCarMode" msgid="4853187425751419467">"ಕಾರ್ ಮೋಡ್ ಸಕ್ರಿಯಗೊಳಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string> + <string name="permlab_enableCarMode" msgid="5684504058192921098">"ಕಾರು ಮೋಡ್ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string> + <string name="permdesc_enableCarMode" msgid="4853187425751419467">"ಕಾರು ಮೋಡ್ ಸಕ್ರಿಯಗೊಳಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string> <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"ಇತರೆ ಅಪ್ಲಿಕೇಶನ್ಗಳನ್ನು ಮುಚ್ಚಿ"</string> <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"ಇತರ ಅಪ್ಲಿಕೇಶನ್ಗಳ ಹಿನ್ನೆಲೆ ಪ್ರಕ್ರಿಯೆಗಳನ್ನು ಅಂತ್ಯಗೊಳಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅವಕಾಶ ಮಾಡಿಕೊಡುತ್ತದೆ. ಇದು ಇತರ ಅಪ್ಲಿಕೇಶನ್ಗಳ ಚಾಲನೆಯನ್ನು ನಿಲ್ಲಿಸುವುದಕ್ಕೆ ಕಾರಣವಾಗಬಹುದು."</string> <string name="permlab_systemAlertWindow" msgid="3543347980839518613">"ಇತರ ಅಪ್ಲಿಕೇಶನ್ಗಳ ಮೇಲೆ ಚಿತ್ರಿಸಿ"</string> @@ -357,9 +357,9 @@ <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"ಹೆಚ್ಚುವರಿ ಸ್ಥಾನ ಪೂರೈಕೆದಾರರ ಆದೇಶಗಳನ್ನು ಪ್ರವೇಶಿಸಿ"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"ಹೆಚ್ಚಿನ ಸ್ಥಾನ ಪೂರೈಕೆದಾರ ಆದೇಶಗಳನ್ನು ಪ್ರವೇಶಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅವಕಾಶ ನೀಡುತ್ತದೆ. ಇದು GPS ಅಥವಾ ಇತರ ಸ್ಥಾನ ಮೂಲಗಳ ಕಾರ್ಯಾಚರಣೆಯಲ್ಲಿ ಮಧ್ಯ ಪ್ರವೇಶಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸಬಹುದು."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"ನಿಖರ ಸ್ಥಳವನ್ನು ಪ್ರವೇಶಿಸಿ (GPS ಮತ್ತು ನೆಟ್ವರ್ಕ್-ಆಧಾರಿತ)"</string> - <string name="permdesc_accessFineLocation" msgid="5295047563564981250">"ಗ್ಲೊಬಲ್ ಪೊಸಿಷನಿಂಗ್ ಸಿಸ್ಟಮ್ (GPS) ಅಥವಾ ಸೆಲ್ ಟವರ್ಗಳು ಮತ್ತು Wi-Fi ನಂತಹ ನೆಟ್ವರ್ಕ್ ಸ್ಥಾನ ಮೂಲಗಳನ್ನು ಬಳಸಿಕೊಂಡು ನಿಮ್ಮ ನಿಖರವಾದ ಸ್ಥಾನವನ್ನು ಪಡೆಯಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ. ಅಪ್ಲಿಕೇಶನ್ಗಾಗಿ ಅವುಗಳನ್ನು ಬಳಸಲು ಈ ಸ್ಥಾನ ಸೇವೆಗಳು ಆನ್ ಆಗಿರಬೇಕು ಮತ್ತು ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಲಭ್ಯವಿರಬೇಕು. ನೀವೆಲ್ಲಿರುವಿರಿ ಎಂಬುದನ್ನು ನಿರ್ಧರಿಸಲು ಅಪ್ಲಿಕೇಶನ್ ಇದನ್ನು ಬಳಸಬಹುದು ಮತ್ತು ಹೆಚ್ಚುವರಿ ಬ್ಯಾಟರಿ ಶಕ್ತಿಯನ್ನು ಬಳಸಬಹುದು."</string> + <string name="permdesc_accessFineLocation" msgid="5295047563564981250">"ಗ್ಲೊಬಲ್ ಪೊಸಿಷನಿಂಗ್ ಸಿಸ್ಟಮ್ (GPS) ಅಥವಾ ಸೆಲ್ ಟವರ್ಗಳು ಮತ್ತು ವೈ-ಫೈ ನಂತಹ ನೆಟ್ವರ್ಕ್ ಸ್ಥಾನ ಮೂಲಗಳನ್ನು ಬಳಸಿಕೊಂಡು ನಿಮ್ಮ ನಿಖರವಾದ ಸ್ಥಾನವನ್ನು ಪಡೆಯಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ. ಅಪ್ಲಿಕೇಶನ್ಗಾಗಿ ಅವುಗಳನ್ನು ಬಳಸಲು ಈ ಸ್ಥಾನ ಸೇವೆಗಳು ಆನ್ ಆಗಿರಬೇಕು ಮತ್ತು ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಲಭ್ಯವಿರಬೇಕು. ನೀವೆಲ್ಲಿರುವಿರಿ ಎಂಬುದನ್ನು ನಿರ್ಧರಿಸಲು ಅಪ್ಲಿಕೇಶನ್ ಇದನ್ನು ಬಳಸಬಹುದು ಮತ್ತು ಹೆಚ್ಚುವರಿ ಬ್ಯಾಟರಿ ಶಕ್ತಿಯನ್ನು ಬಳಸಬಹುದು."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"ಅಂದಾಜು ಸ್ಥಳವನ್ನು ಪ್ರವೇಶಿಸಿ (ನೆಟ್ವರ್ಕ್-ಆಧಾರಿತ)"</string> - <string name="permdesc_accessCoarseLocation" msgid="2538200184373302295">"ನಿಮ್ಮ ಅಂದಾಜು ಸ್ಥಳವನ್ನು ಪಡೆದುಕೊಳ್ಳಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ. ಈ ಸ್ಥಳವನ್ನು ಸೆಲ್ ಟವರ್ಗಳು ಮತ್ತು Wi-Fi ನಂತಹ ನೆಟ್ವರ್ಕ್ ಸ್ಥಾನದ ಮೂಲಗಳನ್ನು ಬಳಸಿಕೊಂಡು ಸ್ಥಳದ ಸೇವೆಗಳ ಮೂಲಕ ಪಡೆಯಲಾಗಿದೆ. ಅಪ್ಲಿಕೇಶನ್ಗಾಗಿ ಅವುಗಳನ್ನು ಬಳಸಲು ಈ ಸ್ಥಾನ ಸೇವೆಗಳನ್ನು ಆನ್ ಮಾಡಿರಬೇಕು ಮತ್ತು ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಲಭ್ಯವಿರಬೇಕು. ನೀವು ನಿಖರವಾಗಿ ಎಲ್ಲಿರುವಿರಿ ಎಂಬುದನ್ನು ನಿರ್ಧರಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗಳು ಇದನ್ನು ಬಳಸಬಹುದು."</string> + <string name="permdesc_accessCoarseLocation" msgid="2538200184373302295">"ನಿಮ್ಮ ಅಂದಾಜು ಸ್ಥಳವನ್ನು ಪಡೆದುಕೊಳ್ಳಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ. ಈ ಸ್ಥಳವನ್ನು ಸೆಲ್ ಟವರ್ಗಳು ಮತ್ತು ವೈ-ಫೈ ನಂತಹ ನೆಟ್ವರ್ಕ್ ಸ್ಥಾನದ ಮೂಲಗಳನ್ನು ಬಳಸಿಕೊಂಡು ಸ್ಥಳದ ಸೇವೆಗಳ ಮೂಲಕ ಪಡೆಯಲಾಗಿದೆ. ಅಪ್ಲಿಕೇಶನ್ಗಾಗಿ ಅವುಗಳನ್ನು ಬಳಸಲು ಈ ಸ್ಥಾನ ಸೇವೆಗಳನ್ನು ಆನ್ ಮಾಡಿರಬೇಕು ಮತ್ತು ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಲಭ್ಯವಿರಬೇಕು. ನೀವು ನಿಖರವಾಗಿ ಎಲ್ಲಿರುವಿರಿ ಎಂಬುದನ್ನು ನಿರ್ಧರಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗಳು ಇದನ್ನು ಬಳಸಬಹುದು."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"ನಿಮ್ಮ ಆಡಿಯೊ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಬದಲಾಯಿಸಿ"</string> <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"ವಾಲ್ಯೂಮ್ ರೀತಿಯ ಮತ್ತು ಔಟ್ಪುಟ್ಗಾಗಿ ಯಾವ ಸ್ಪೀಕರ್ ಬಳಸಬೇಕು ಎಂಬ ರೀತಿಯ ಜಾಗತಿಕ ಆಡಿಯೊ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅವಕಾಶ ಮಾಡಿಕೊಡುತ್ತದೆ."</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"ಆಡಿಯೊ ರೆಕಾರ್ಡ್ ಮಾಡಿ"</string> @@ -406,14 +406,14 @@ <string name="permdesc_changeNetworkState" msgid="6789123912476416214">"ನೆಟ್ವರ್ಕ್ ಸಂಪರ್ಕದ ಸ್ಥಿತಿಯನ್ನು ಬದಲಾಯಿಸಲು ಅಪ್ಲಿಕೇಶನ್ ಅನುಮತಿಸುತ್ತದೆ."</string> <string name="permlab_changeTetherState" msgid="5952584964373017960">"ಟೆಥರಡ್ ಸಂಪರ್ಕತೆಯನ್ನು ಬದಲಾಯಿಸಿ"</string> <string name="permdesc_changeTetherState" msgid="1524441344412319780">"ಟೆಥರ್ ಮಾಡಲಾದ ನೆಟ್ವರ್ಕ್ ಸಂಪರ್ಕದ ಸ್ಥಿತಿಯನ್ನು ಬದಲಾಯಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string> - <string name="permlab_accessWifiState" msgid="5202012949247040011">"Wi-Fi ಸಂಪರ್ಕಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string> - <string name="permdesc_accessWifiState" msgid="5002798077387803726">"Wi-Fi ಸಕ್ರಿಯಗೊಂಡಿದೆಯೇ ಮತ್ತು ಸಂಪರ್ಕಿಸಲಾದ Wi-Fi ಸಾಧನಗಳ ಹೆಸರಿನ ಮಾಹಿತಿ ರೀತಿಯ, Wi-Fi ನೆಟ್ವರ್ಕ್ ಕುರಿತು ಮಾಹಿತಿಯನ್ನು ವೀಕ್ಷಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅವಕಾಶ ನೀಡುತ್ತದೆ."</string> - <string name="permlab_changeWifiState" msgid="6550641188749128035">"Wi-Fi ನಿಂದ ಸಂಪರ್ಕಗೊಳಿಸಿ ಮತ್ತು ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಿ"</string> - <string name="permdesc_changeWifiState" msgid="7137950297386127533">"Wi-Fi ಪ್ರವೇಶ ಕೇಂದ್ರಗಳಿಂದ ಸಂಪರ್ಕ ಹೊಂದಲು ಮತ್ತು ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಲು, ಹಾಗೆಯೇ Wi-Fi ನೆಟ್ವರ್ಕ್ಗಳಿಗೆ ಸಾಧನದ ಕನ್ಫಿಗರೇಶನ್ ಬದಲಾಯಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅವಕಾಶ ಮಾಡಿಕೊಡುತ್ತದೆ."</string> - <string name="permlab_changeWifiMulticastState" msgid="1368253871483254784">"Wi-Fi ಮಲ್ಟಿಕ್ಯಾಸ್ಟ್ ಸ್ವೀಕಾರಕ್ಕೆ ಅನುಮತಿಸಿ"</string> - <string name="permdesc_changeWifiMulticastState" product="tablet" msgid="7969774021256336548">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಮಾತ್ರವಲ್ಲದೇ, ಮಲ್ಟಿಕ್ಯಾಸ್ಟ್ ವಿಳಾಸಗಳನ್ನು ಬಳಸಿಕೊಂಡು Wi-Fi ನೆಟ್ವರ್ಕ್ನಲ್ಲಿ ಎಲ್ಲಾ ಸಾಧನಗಳಿಗೆ ಕಳುಹಿಸಲಾಗಿರುವ ಪ್ಯಾಕೆಟ್ಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅವಕಾಶ ನೀಡುತ್ತದೆ. ಇದು ಮಲ್ಟಿಕ್ಯಾಸ್ಟ್ ಅಲ್ಲದ ಮೋಡ್ ಬಳಸುವ ಶಕ್ತಿಗಿಂತಲೂ ಹೆಚ್ಚಿನ ಶಕ್ತಿಯನ್ನು ಬಳಸುತ್ತದೆ."</string> - <string name="permdesc_changeWifiMulticastState" product="tv" msgid="9031975661145014160">"Wi-Fi ನೆಟ್ವರ್ಕ್ನಲ್ಲಿ ನಿಮ್ಮ ಟಿವಿ ಮಾತ್ರವಲ್ಲದೆ, ಮಲ್ಟಿಕ್ಯಾಸ್ಟ್ ವಿಳಾಸಗಳನ್ನು ಬಳಸಿಕೊಂಡು ಎಲ್ಲಾ ಸಾಧನಗಳಿಗೆ ಕಳುಹಿಸಲಾದ ಪ್ಯಾಕೆಟ್ಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ. ಇದು ಮಲ್ಟಿಕ್ಯಾಸ್ಟ್ ಅಲ್ಲದ ಮೋಡ್ಗಿಂತಲೂ ಹೆಚ್ಚು ಪವರ್ ಬಳಸುತ್ತದೆ."</string> - <string name="permdesc_changeWifiMulticastState" product="default" msgid="6851949706025349926">"ನಿಮ್ಮ ಫೋನ್ ಮಾತ್ರವಲ್ಲದೇ, ಮಲ್ಟಿಕಾಸ್ಟ್ ವಿಳಾಸಗಳನ್ನು ಬಳಸಿಕೊಂಡು Wi-Fi ನೆಟ್ವರ್ಕ್ನಲ್ಲಿ ಎಲ್ಲಾ ಸಾಧನಗಳಿಗೆ ಕಳುಹಿಸಲಾಗಿರುವ ಪ್ಯಾಕೆಟ್ಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅವಕಾಶ ನೀಡುತ್ತದೆ. ಇದು ಮಲ್ಟಿಕ್ಯಾಸ್ಟ್ ಅಲ್ಲದ ಮೋಡ್ ಬಳಸುವ ಶಕ್ತಿಗಿಂತಲೂ ಹೆಚ್ಚಿನ ಶಕ್ತಿಯನ್ನು ಬಳಸುತ್ತದೆ."</string> + <string name="permlab_accessWifiState" msgid="5202012949247040011">"ವೈ-ಫೈ ಸಂಪರ್ಕಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string> + <string name="permdesc_accessWifiState" msgid="5002798077387803726">"ವೈ-ಫೈ ಸಕ್ರಿಯಗೊಂಡಿದೆಯೇ ಮತ್ತು ಸಂಪರ್ಕಿಸಲಾದ ವೈ-ಫೈ ಸಾಧನಗಳ ಹೆಸರಿನ ಮಾಹಿತಿ ರೀತಿಯ, ವೈ-ಫೈ ನೆಟ್ವರ್ಕ್ ಕುರಿತು ಮಾಹಿತಿಯನ್ನು ವೀಕ್ಷಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅವಕಾಶ ನೀಡುತ್ತದೆ."</string> + <string name="permlab_changeWifiState" msgid="6550641188749128035">"ವೈ-ಫೈ ನಿಂದ ಸಂಪರ್ಕಗೊಳಿಸಿ ಮತ್ತು ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಿ"</string> + <string name="permdesc_changeWifiState" msgid="7137950297386127533">"ವೈ-ಫೈ ಪ್ರವೇಶ ಕೇಂದ್ರಗಳಿಂದ ಸಂಪರ್ಕ ಹೊಂದಲು ಮತ್ತು ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಲು, ಹಾಗೆಯೇ ವೈ-ಫೈ ನೆಟ್ವರ್ಕ್ಗಳಿಗೆ ಸಾಧನದ ಕನ್ಫಿಗರೇಶನ್ ಬದಲಾಯಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅವಕಾಶ ಮಾಡಿಕೊಡುತ್ತದೆ."</string> + <string name="permlab_changeWifiMulticastState" msgid="1368253871483254784">"ವೈ-ಫೈ ಮಲ್ಟಿಕ್ಯಾಸ್ಟ್ ಸ್ವೀಕಾರಕ್ಕೆ ಅನುಮತಿಸಿ"</string> + <string name="permdesc_changeWifiMulticastState" product="tablet" msgid="7969774021256336548">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಮಾತ್ರವಲ್ಲದೇ, ಮಲ್ಟಿಕ್ಯಾಸ್ಟ್ ವಿಳಾಸಗಳನ್ನು ಬಳಸಿಕೊಂಡು ವೈ-ಫೈ ನೆಟ್ವರ್ಕ್ನಲ್ಲಿ ಎಲ್ಲಾ ಸಾಧನಗಳಿಗೆ ಕಳುಹಿಸಲಾಗಿರುವ ಪ್ಯಾಕೆಟ್ಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅವಕಾಶ ನೀಡುತ್ತದೆ. ಇದು ಮಲ್ಟಿಕ್ಯಾಸ್ಟ್ ಅಲ್ಲದ ಮೋಡ್ ಬಳಸುವ ಶಕ್ತಿಗಿಂತಲೂ ಹೆಚ್ಚಿನ ಶಕ್ತಿಯನ್ನು ಬಳಸುತ್ತದೆ."</string> + <string name="permdesc_changeWifiMulticastState" product="tv" msgid="9031975661145014160">"ವೈ-ಫೈ ನೆಟ್ವರ್ಕ್ನಲ್ಲಿ ನಿಮ್ಮ ಟಿವಿ ಮಾತ್ರವಲ್ಲದೆ, ಮಲ್ಟಿಕ್ಯಾಸ್ಟ್ ವಿಳಾಸಗಳನ್ನು ಬಳಸಿಕೊಂಡು ಎಲ್ಲಾ ಸಾಧನಗಳಿಗೆ ಕಳುಹಿಸಲಾದ ಪ್ಯಾಕೆಟ್ಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ. ಇದು ಮಲ್ಟಿಕ್ಯಾಸ್ಟ್ ಅಲ್ಲದ ಮೋಡ್ಗಿಂತಲೂ ಹೆಚ್ಚು ಪವರ್ ಬಳಸುತ್ತದೆ."</string> + <string name="permdesc_changeWifiMulticastState" product="default" msgid="6851949706025349926">"ನಿಮ್ಮ ಫೋನ್ ಮಾತ್ರವಲ್ಲದೇ, ಮಲ್ಟಿಕಾಸ್ಟ್ ವಿಳಾಸಗಳನ್ನು ಬಳಸಿಕೊಂಡು ವೈ-ಫೈ ನೆಟ್ವರ್ಕ್ನಲ್ಲಿ ಎಲ್ಲಾ ಸಾಧನಗಳಿಗೆ ಕಳುಹಿಸಲಾಗಿರುವ ಪ್ಯಾಕೆಟ್ಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅವಕಾಶ ನೀಡುತ್ತದೆ. ಇದು ಮಲ್ಟಿಕ್ಯಾಸ್ಟ್ ಅಲ್ಲದ ಮೋಡ್ ಬಳಸುವ ಶಕ್ತಿಗಿಂತಲೂ ಹೆಚ್ಚಿನ ಶಕ್ತಿಯನ್ನು ಬಳಸುತ್ತದೆ."</string> <string name="permlab_bluetoothAdmin" msgid="6006967373935926659">"ಬ್ಲೂಟೂತ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಪ್ರವೇಶಿಸಿ"</string> <string name="permdesc_bluetoothAdmin" product="tablet" msgid="6921177471748882137">"ಸ್ಥಳೀಯ ಬ್ಲೂಟೂತ್ ಟ್ಯಾಬ್ಲೆಟ್ ಕಾನ್ಫಿಗರ್ ಮಾಡಲು ಮತ್ತು ಅನ್ವೇಷಿಸಲು ಹಾಗೂ ರಿಮೊಟ್ ಸಾಧನಗಳ ಜೊತೆಗೆ ಜೋಡಿ ಮಾಡಲು ಅಪ್ಲಿಕೇಶನ್ ಅನುಮತಿಸುತ್ತದೆ."</string> <string name="permdesc_bluetoothAdmin" product="tv" msgid="3373125682645601429">"ಸ್ಥಳೀಯ ಬ್ಲೂಟೂತ್ ಟಿವಿಯನ್ನು ಕಾನ್ಫಿಗರ್ ಮಾಡಲು, ಮತ್ತು ಅನ್ವೇಷಿಸಲು ಮತ್ತು ದೂರ ಸಾಧನಗಳೊಂದಿಗೆ ಜೋಡಿ ಮಾಡಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string> @@ -430,29 +430,29 @@ <string name="permdesc_bluetooth" product="default" msgid="3207106324452312739">"ಫೋನ್ನಲ್ಲಿ ಬ್ಲೂಟೂತ್ ಕಾನ್ಫಿಗರೇಶನ್ ಅನ್ನು ವೀಕ್ಷಿಸಲು ಮತ್ತು ಜೋಡಿ ಮಾಡಿರುವ ಸಾಧನಗಳೊಂದಿಗೆ ಸಂಪರ್ಕಗಳನ್ನು ಕಲ್ಪಿಸಲು ಹಾಗೂ ಸ್ವೀಕರಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅವಕಾಶ ಮಾಡಿಕೊಡುತ್ತದೆ."</string> <string name="permlab_nfc" msgid="4423351274757876953">"ಸಮೀಪ ಕ್ಷೇತ್ರ ಸಂವಹನವನ್ನು ನಿಯಂತ್ರಿಸಿ"</string> <string name="permdesc_nfc" msgid="7120611819401789907">"ಸಮೀಪದ ಕ್ಷೇತ್ರ ಸಂವಹನ (NFC) ಟ್ಯಾಗ್ಗಳು, ಕಾರ್ಡ್ಗಳು, ಮತ್ತು ಓದುಗರನ್ನು ಅಪ್ಲಿಕೇಶನ್ ಅನುಮತಿಸುತ್ತದೆ."</string> - <string name="permlab_disableKeyguard" msgid="3598496301486439258">"ನಿಮ್ಮ ಪರದೆ ಲಾಕ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string> + <string name="permlab_disableKeyguard" msgid="3598496301486439258">"ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string> <string name="permdesc_disableKeyguard" msgid="6034203065077122992">"ಕೀಲಾಕ್ ಮತ್ತು ಯಾವುದೇ ಸಂಬಂಧಿತ ಭದ್ರತಾ ಪಾಸ್ವರ್ಡ್ ಭದ್ರತೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿ ನೀಡುತ್ತದೆ. ಉದಾಹರಣೆಗೆ, ಒಳಬರುವ ಕರೆಯನ್ನು ಸ್ವೀಕರಿಸುವಾಗ ಕೀಲಾಕ್ ಅನ್ನು ಫೋನ್ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ, ನಂತರ ಕರೆಯು ಅಂತ್ಯಗೊಂಡಾಗ ಕೀಲಾಕ್ ಅನ್ನು ಮರು ಸಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ."</string> - <string name="permlab_manageFingerprint" msgid="5640858826254575638">"ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಹಾರ್ಡ್ವೇರ್ ನಿರ್ವಹಿಸಿ"</string> - <string name="permdesc_manageFingerprint" msgid="178208705828055464">"ಬಳಕೆಗೆ ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಟೆಂಪ್ಲೇಟ್ಗಳನ್ನು ಸೇರಿಸಲು ಮತ್ತು ಅಳಿಸಲು ವಿಧಾನಗಳನ್ನು ಮನವಿ ಮಾಡಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string> - <string name="permlab_useFingerprint" msgid="3150478619915124905">"ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಹಾರ್ಡ್ವೇರ್ ಬಳಸಿ"</string> - <string name="permdesc_useFingerprint" msgid="9165097460730684114">"ಪ್ರಮಾಣೀಕರಣಕ್ಕಾಗಿ ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಹಾರ್ಡ್ವೇರ್ ಬಳಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ"</string> - <string name="fingerprint_acquired_partial" msgid="735082772341716043">"ಭಾಗಶಃ ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಪತ್ತೆಯಾಗಿದೆ. ದಯವಿಟ್ಟು ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string> - <string name="fingerprint_acquired_insufficient" msgid="4596546021310923214">"ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಪ್ರಕ್ರಿಯೆಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ದಯವಿಟ್ಟು ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string> - <string name="fingerprint_acquired_imager_dirty" msgid="1087209702421076105">"ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಸೆನ್ಸಾರ್ ಕೊಳೆಯಾಗಿದೆ. ದಯವಿಟ್ಟು ಅದನ್ನು ಸ್ವಚ್ಛಗೊಳಿಸಿ ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string> + <string name="permlab_manageFingerprint" msgid="5640858826254575638">"ಬೆರಳಚ್ಚು ಹಾರ್ಡ್ವೇರ್ ನಿರ್ವಹಿಸಿ"</string> + <string name="permdesc_manageFingerprint" msgid="178208705828055464">"ಬಳಕೆಗೆ ಬೆರಳಚ್ಚು ಟೆಂಪ್ಲೇಟ್ಗಳನ್ನು ಸೇರಿಸಲು ಮತ್ತು ಅಳಿಸಲು ವಿಧಾನಗಳನ್ನು ಮನವಿ ಮಾಡಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string> + <string name="permlab_useFingerprint" msgid="3150478619915124905">"ಬೆರಳಚ್ಚು ಹಾರ್ಡ್ವೇರ್ ಬಳಸಿ"</string> + <string name="permdesc_useFingerprint" msgid="9165097460730684114">"ಪ್ರಮಾಣೀಕರಣಕ್ಕಾಗಿ ಬೆರಳಚ್ಚು ಹಾರ್ಡ್ವೇರ್ ಬಳಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ"</string> + <string name="fingerprint_acquired_partial" msgid="735082772341716043">"ಭಾಗಶಃ ಬೆರಳಚ್ಚು ಪತ್ತೆಯಾಗಿದೆ. ದಯವಿಟ್ಟು ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string> + <string name="fingerprint_acquired_insufficient" msgid="4596546021310923214">"ಬೆರಳಚ್ಚು ಪ್ರಕ್ರಿಯೆಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ದಯವಿಟ್ಟು ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string> + <string name="fingerprint_acquired_imager_dirty" msgid="1087209702421076105">"ಬೆರಳಚ್ಚು ಸೆನ್ಸಾರ್ ಕೊಳೆಯಾಗಿದೆ. ದಯವಿಟ್ಟು ಅದನ್ನು ಸ್ವಚ್ಛಗೊಳಿಸಿ ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string> <string name="fingerprint_acquired_too_fast" msgid="6470642383109155969">"ಬೆರಳನ್ನು ಅತಿ ವೇಗವಾಗಿ ಸರಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string> <string name="fingerprint_acquired_too_slow" msgid="59250885689661653">"ಬೆರಳನ್ನು ತುಂಬಾ ನಿಧಾನವಾಗಿ ಸರಿಸಲಾಗಿದೆ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string> <string-array name="fingerprint_acquired_vendor"> </string-array> - <string name="fingerprint_error_hw_not_available" msgid="7955921658939936596">"ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಹಾರ್ಡ್ವೇರ್ ಲಭ್ಯವಿಲ್ಲ."</string> - <string name="fingerprint_error_no_space" msgid="1055819001126053318">"ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಸಂಗ್ರಹಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಫಿಂಗರ್ಪ್ರಿಂಟ್ ತೆಗೆದುಹಾಕಿ."</string> - <string name="fingerprint_error_timeout" msgid="3927186043737732875">"ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಅವಧಿ ಮೀರಿದೆ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string> - <string name="fingerprint_error_canceled" msgid="4402024612660774395">"ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಕಾರ್ಯಾಚರಣೆಯನ್ನು ರದ್ದುಮಾಡಲಾಗಿದೆ."</string> + <string name="fingerprint_error_hw_not_available" msgid="7955921658939936596">"ಬೆರಳಚ್ಚು ಹಾರ್ಡ್ವೇರ್ ಲಭ್ಯವಿಲ್ಲ."</string> + <string name="fingerprint_error_no_space" msgid="1055819001126053318">"ಬೆರಳಚ್ಚು ಸಂಗ್ರಹಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಬೆರಳಚ್ಚು ತೆಗೆದುಹಾಕಿ."</string> + <string name="fingerprint_error_timeout" msgid="3927186043737732875">"ಬೆರಳಚ್ಚು ಅವಧಿ ಮೀರಿದೆ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string> + <string name="fingerprint_error_canceled" msgid="4402024612660774395">"ಬೆರಳಚ್ಚು ಕಾರ್ಯಾಚರಣೆಯನ್ನು ರದ್ದುಮಾಡಲಾಗಿದೆ."</string> <string name="fingerprint_error_lockout" msgid="5536934748136933450">"ಹಲವಾರು ಪ್ರಯತ್ನಗಳು. ನಂತರ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string> <string name="fingerprint_error_unable_to_process" msgid="6107816084103552441">"ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string> <string name="fingerprint_name_template" msgid="5870957565512716938">"ಫಿಂಗರ್ <xliff:g id="FINGERID">%d</xliff:g>"</string> <string-array name="fingerprint_error_vendor"> </string-array> - <string name="fingerprint_icon_content_description" msgid="2340202869968465936">"ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಐಕಾನ್"</string> + <string name="fingerprint_icon_content_description" msgid="2340202869968465936">"ಬೆರಳಚ್ಚು ಐಕಾನ್"</string> <string name="permlab_readSyncSettings" msgid="6201810008230503052">"ಸಿಂಕ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ರೀಡ್ ಮಾಡು"</string> <string name="permdesc_readSyncSettings" msgid="2706745674569678644">"ಒಂದು ಖಾತೆಯ ಸಿಂಕ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಓದಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅವಕಾಶ ನೀಡುತ್ತದೆ. ಉದಾಹರಣೆಗೆ, ಖಾತೆಯೊಂದಿಗೆ ಜನರ ಅಪ್ಲಿಕೇಶನ್ ಸಿಂಕ್ ಮಾಡಲಾಗಿದೆಯೇ ಎಂಬುದನ್ನು ಇದು ನಿರ್ಧರಿಸಬಹುದು."</string> <string name="permlab_writeSyncSettings" msgid="5408694875793945314">"ಸಿಂಕ್ ಆನ್ ಮತ್ತು ಸಿಂಕ್ ಆಫ್ ಟಾಗಲ್ ಮಾಡಿ"</string> @@ -522,9 +522,9 @@ <string name="policydesc_watchLogin_secondaryUser" product="tablet" msgid="4280246270601044505">"ಪರದೆಯನ್ನು ಅನ್ಲಾಕ್ ಮಾಡುವಾಗ ಟೈಪ್ ಮಾಡಲಾದ ತಪ್ಪಾಗಿರುವ ಪಾಸ್ವರ್ಡ್ಗಳ ಸಂಖ್ಯೆಯನ್ನು ವೀಕ್ಷಿಸಿ ಮತ್ತು ಟ್ಯಾಬ್ಲೆಟ್ ಲಾಕ್ ಮಾಡಿ ಅಥವಾ ಹಲವಾರು ತಪ್ಪಾದ ಪಾಸ್ವರ್ಡ್ಗಳನ್ನು ಟೈಪ್ ಮಾಡಲಾಗಿದ್ದರೆ ಈ ಬಳಕೆದಾರರ ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸಿಹಾಕಿ."</string> <string name="policydesc_watchLogin_secondaryUser" product="TV" msgid="3484832653564483250">"ಪರದೆಯನ್ನು ಅನ್ಲಾಕ್ ಮಾಡುವಾಗ ಟೈಪ್ ಮಾಡಲಾದ ತಪ್ಪಾಗಿರುವ ಪಾಸ್ವರ್ಡ್ಗಳ ಸಂಖ್ಯೆಯನ್ನು ವೀಕ್ಷಿಸಿ ಮತ್ತು ಟಿವಿಯನ್ನು ಲಾಕ್ ಮಾಡಿ ಅಥವಾ ಹಲವಾರು ತಪ್ಪಾದ ಪಾಸ್ವರ್ಡ್ಗಳನ್ನು ಟೈಪ್ ಮಾಡಲಾಗಿದ್ದರೆ ಈ ಬಳಕೆದಾರರ ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸಿಹಾಕಿ."</string> <string name="policydesc_watchLogin_secondaryUser" product="default" msgid="2185480427217127147">"ಪರದೆಯನ್ನು ಅನ್ಲಾಕ್ ಮಾಡುವಾಗ ಟೈಪ್ ಮಾಡಲಾದ ತಪ್ಪಾಗಿರುವ ಪಾಸ್ವರ್ಡ್ಗಳ ಸಂಖ್ಯೆಯನ್ನು ವೀಕ್ಷಿಸಿ ಮತ್ತು ಫೋನ್ ಲಾಕ್ ಮಾಡಿ ಅಥವಾ ಹಲವಾರು ತಪ್ಪಾದ ಪಾಸ್ವರ್ಡ್ಗಳನ್ನು ಟೈಪ್ ಮಾಡಲಾಗಿದ್ದರೆ ಈ ಬಳಕೆದಾರರ ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸಿಹಾಕಿ."</string> - <string name="policylab_resetPassword" msgid="4934707632423915395">"ಪರದೆ ಲಾಕ್ ಬದಲಾಯಿಸಿ"</string> - <string name="policydesc_resetPassword" msgid="1278323891710619128">"ಪರದೆ ಲಾಕ್ ಬದಲಾಯಿಸಿ."</string> - <string name="policylab_forceLock" msgid="2274085384704248431">"ಪರದೆ ಲಾಕ್ ಮಾಡಿ"</string> + <string name="policylab_resetPassword" msgid="4934707632423915395">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಬದಲಾಯಿಸಿ"</string> + <string name="policydesc_resetPassword" msgid="1278323891710619128">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಬದಲಾಯಿಸಿ."</string> + <string name="policylab_forceLock" msgid="2274085384704248431">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಮಾಡಿ"</string> <string name="policydesc_forceLock" msgid="1141797588403827138">"ಪರದೆಯು ಯಾವಾಗ ಮತ್ತು ಹೇಗೆ ಲಾಕ್ ಆಗಬೇಕೆಂಬುದನ್ನು ನಿಯಂತ್ರಿಸಿ."</string> <string name="policylab_wipeData" msgid="3910545446758639713">"ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸಿ"</string> <string name="policydesc_wipeData" product="tablet" msgid="4306184096067756876">"ಫ್ಯಾಕ್ಟರಿ ಡೇಟಾ ಮರುಹೊಂದಿಕೆಯನ್ನು ನಿರ್ವಹಿಸುವ ಮೂಲಕ ಎಚ್ಚರಿಕೆಯನ್ನು ನೀಡದೆಯೇ ಟ್ಯಾಬ್ಲೆಟ್ ಡೇಟಾವನ್ನು ಅಳಿಸಿಹಾಕಿ."</string> @@ -536,38 +536,38 @@ <string name="policydesc_wipeData_secondaryUser" product="default" msgid="6787904546711590238">"ಯಾವುದೇ ಸೂಚನೆ ಇಲ್ಲದೆ ಈ ಫೋನ್ನಲ್ಲಿ ಈ ಬಳಕೆದಾರರ ಡೇಟಾವನ್ನು ಅಳಿಸಿ."</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"ಸಾಧನವನ್ನು ಜಾಗತಿಕ ಪ್ರಾಕ್ಸಿಗೆ ಹೊಂದಿಸಿ"</string> <string name="policydesc_setGlobalProxy" msgid="8459859731153370499">"ನೀತಿಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿದಾಗ ಬಳಸಬೇಕಾದ ಸಾಧನದ ಜಾಗತಿಕ ಪ್ರಾಕ್ಸಿಯನ್ನು ಹೊಂದಿಸಿ. ಸಾಧನದ ಮಾಲೀಕರು ಮಾತ್ರ ಜಾಗತಿಕ ಪ್ರಾಕ್ಸಿಯನ್ನು ಹೊಂದಿಸಬಹುದಾಗಿರುತ್ತದೆ."</string> - <string name="policylab_expirePassword" msgid="5610055012328825874">"ಪರದೆ ಲಾಕ್ ಪಾಸ್ವರ್ಡ್ ಮುಕ್ತಾಯವನ್ನು ಹೊಂದಿಸಿ"</string> - <string name="policydesc_expirePassword" msgid="5367525762204416046">"ಪರದೆ ಲಾಕ್ ಪಾಸ್ವರ್ಡ್, ಪಿನ್, ಅಥವಾ ನಮೂನೆಯನ್ನು ಹೆಚ್ಚು ಪದೆ ಪದೇ ಬದಲಾಯಿಸಬೇಕಾಗಿರುತ್ತದೆ ಎಂಬುದನ್ನು ಬದಲಾಯಿಸಿ."</string> + <string name="policylab_expirePassword" msgid="5610055012328825874">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಪಾಸ್ವರ್ಡ್ ಮುಕ್ತಾಯವನ್ನು ಹೊಂದಿಸಿ"</string> + <string name="policydesc_expirePassword" msgid="5367525762204416046">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಪಾಸ್ವರ್ಡ್, ಪಿನ್, ಅಥವಾ ನಮೂನೆಯನ್ನು ಹೆಚ್ಚು ಪದೆ ಪದೇ ಬದಲಾಯಿಸಬೇಕಾಗಿರುತ್ತದೆ ಎಂಬುದನ್ನು ಬದಲಾಯಿಸಿ."</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"ಸಂಗ್ರಹಣೆ ಎನ್ಕ್ರಿಪ್ಶನ್ ಹೊಂದಿಸಿ"</string> <string name="policydesc_encryptedStorage" msgid="2637732115325316992">"ಸಂಗ್ರಹಿಸಿರುವ ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾವನ್ನು ಎನ್ಕ್ರಿಪ್ಟ್ ಮಾಡಬೇಕಾದ ಅಗತ್ಯವಿದೆ."</string> <string name="policylab_disableCamera" msgid="6395301023152297826">"ಕ್ಯಾಮರಾಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string> <string name="policydesc_disableCamera" msgid="2306349042834754597">"ಎಲ್ಲಾ ಸಾಧನ ಕ್ಯಾಮರಾಗಳ ಬಳಕೆಯನ್ನು ತಡೆಯಿರಿ."</string> - <string name="policylab_disableKeyguardFeatures" msgid="8552277871075367771">"ಕೆಲವು ಪರದೆ ಲಾಕ್ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string> + <string name="policylab_disableKeyguardFeatures" msgid="8552277871075367771">"ಕೆಲವು ಸ್ಕ್ರೀನ್ ಲಾಕ್ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string> <string name="policydesc_disableKeyguardFeatures" msgid="2044755691354158439">"ಕೆಲವು ಪರದೆ ಲಾಕ್ನ ವೈಶಿಷ್ಟ್ಯಗಳ ಬಳಕೆಯನ್ನು ತಡೆಯಿರಿ."</string> <string-array name="phoneTypes"> - <item msgid="8901098336658710359">"ನಿವಾಸ"</item> + <item msgid="8901098336658710359">"ಮನೆ"</item> <item msgid="869923650527136615">"ಮೊಬೈಲ್"</item> <item msgid="7897544654242874543">"ಕಚೇರಿ"</item> <item msgid="1103601433382158155">"ಕಚೇರಿ ಫಾಕ್ಸ್"</item> - <item msgid="1735177144948329370">"ನಿವಾಸದ ಫ್ಯಾಕ್ಸ್"</item> + <item msgid="1735177144948329370">"ಮನೆಯ ಫ್ಯಾಕ್ಸ್"</item> <item msgid="603878674477207394">"ಪೇಜರ್"</item> <item msgid="1650824275177931637">"ಇತರೆ"</item> <item msgid="9192514806975898961">"ಕಸ್ಟಮ್"</item> </string-array> <string-array name="emailAddressTypes"> - <item msgid="8073994352956129127">"ನಿವಾಸ"</item> + <item msgid="8073994352956129127">"ಮನೆ"</item> <item msgid="7084237356602625604">"ಕಚೇರಿ"</item> <item msgid="1112044410659011023">"ಇತರೆ"</item> <item msgid="2374913952870110618">"ಕಸ್ಟಮ್"</item> </string-array> <string-array name="postalAddressTypes"> - <item msgid="6880257626740047286">"ನಿವಾಸ"</item> + <item msgid="6880257626740047286">"ಮನೆ"</item> <item msgid="5629153956045109251">"ಕಚೇರಿ"</item> <item msgid="4966604264500343469">"ಇತರೆ"</item> <item msgid="4932682847595299369">"ಕಸ್ಟಮ್"</item> </string-array> <string-array name="imAddressTypes"> - <item msgid="1738585194601476694">"ನಿವಾಸ"</item> + <item msgid="1738585194601476694">"ಮನೆ"</item> <item msgid="1359644565647383708">"ಕಚೇರಿ"</item> <item msgid="7868549401053615677">"ಇತರೆ"</item> <item msgid="3145118944639869809">"ಕಸ್ಟಮ್"</item> @@ -588,15 +588,15 @@ <item msgid="1648797903785279353">"Jabber"</item> </string-array> <string name="phoneTypeCustom" msgid="1644738059053355820">"ಕಸ್ಟಮ್"</string> - <string name="phoneTypeHome" msgid="2570923463033985887">"ನಿವಾಸ"</string> + <string name="phoneTypeHome" msgid="2570923463033985887">"ಮನೆ"</string> <string name="phoneTypeMobile" msgid="6501463557754751037">"ಮೊಬೈಲ್"</string> <string name="phoneTypeWork" msgid="8863939667059911633">"ಕಚೇರಿ"</string> <string name="phoneTypeFaxWork" msgid="3517792160008890912">"ಕಚೇರಿ ಫಾಕ್ಸ್"</string> - <string name="phoneTypeFaxHome" msgid="2067265972322971467">"ನಿವಾಸದ ಫ್ಯಾಕ್ಸ್"</string> + <string name="phoneTypeFaxHome" msgid="2067265972322971467">"ಮನೆಯ ಫ್ಯಾಕ್ಸ್"</string> <string name="phoneTypePager" msgid="7582359955394921732">"ಪೇಜರ್"</string> <string name="phoneTypeOther" msgid="1544425847868765990">"ಇತರೆ"</string> <string name="phoneTypeCallback" msgid="2712175203065678206">"ಮರಳಿ ಕರೆಮಾಡು"</string> - <string name="phoneTypeCar" msgid="8738360689616716982">"ಕಾರ್"</string> + <string name="phoneTypeCar" msgid="8738360689616716982">"ಕಾರು"</string> <string name="phoneTypeCompanyMain" msgid="540434356461478916">"ಕಂಪನಿ ಮುಖ್ಯ"</string> <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string> <string name="phoneTypeMain" msgid="6766137010628326916">"ಪ್ರಮುಖ"</string> @@ -613,16 +613,16 @@ <string name="eventTypeAnniversary" msgid="3876779744518284000">"ವಾರ್ಷಿಕೋತ್ಸವ"</string> <string name="eventTypeOther" msgid="7388178939010143077">"ಇತರೆ"</string> <string name="emailTypeCustom" msgid="8525960257804213846">"ಕಸ್ಟಮ್"</string> - <string name="emailTypeHome" msgid="449227236140433919">"ಮುಖಪುಟ"</string> + <string name="emailTypeHome" msgid="449227236140433919">"ಮನೆ"</string> <string name="emailTypeWork" msgid="3548058059601149973">"ಕಚೇರಿ"</string> <string name="emailTypeOther" msgid="2923008695272639549">"ಇತರೆ"</string> <string name="emailTypeMobile" msgid="119919005321166205">"ಮೊಬೈಲ್"</string> <string name="postalTypeCustom" msgid="8903206903060479902">"ಕಸ್ಟಮ್"</string> - <string name="postalTypeHome" msgid="8165756977184483097">"ನಿವಾಸ"</string> + <string name="postalTypeHome" msgid="8165756977184483097">"ಮನೆ"</string> <string name="postalTypeWork" msgid="5268172772387694495">"ಕಚೇರಿ"</string> <string name="postalTypeOther" msgid="2726111966623584341">"ಇತರೆ"</string> <string name="imTypeCustom" msgid="2074028755527826046">"ಕಸ್ಟಮ್"</string> - <string name="imTypeHome" msgid="6241181032954263892">"ನಿವಾಸ"</string> + <string name="imTypeHome" msgid="6241181032954263892">"ಮನೆ"</string> <string name="imTypeWork" msgid="1371489290242433090">"ಕಚೇರಿ"</string> <string name="imTypeOther" msgid="5377007495735915478">"ಇತರೆ"</string> <string name="imProtocolCustom" msgid="6919453836618749992">"ಕಸ್ಟಮ್"</string> @@ -654,7 +654,7 @@ <string name="relationTypeSister" msgid="1735983554479076481">"ಸಹೋದರಿ"</string> <string name="relationTypeSpouse" msgid="394136939428698117">"ಸಂಗಾತಿ"</string> <string name="sipAddressTypeCustom" msgid="2473580593111590945">"ಕಸ್ಟಮ್"</string> - <string name="sipAddressTypeHome" msgid="6093598181069359295">"ನಿವಾಸ"</string> + <string name="sipAddressTypeHome" msgid="6093598181069359295">"ಮನೆ"</string> <string name="sipAddressTypeWork" msgid="6920725730797099047">"ಕಚೇರಿ"</string> <string name="sipAddressTypeOther" msgid="4408436162950119849">"ಇತರೆ"</string> <string name="quick_contacts_not_available" msgid="746098007828579688">"ಈ ಸಂಪರ್ಕವನ್ನು ವೀಕ್ಷಿಸಲು ಯಾವುದೇ ಅಪ್ಲಿಕೇಶನ್ ಕಂಡುಬಂದಿಲ್ಲ."</string> @@ -669,15 +669,15 @@ <string name="keyguard_label_text" msgid="861796461028298424">"ಅನ್ಲಾಕ್ ಮಾಡಲು, ಮೆನು ನಂತರ 0 ಒತ್ತಿರಿ."</string> <string name="emergency_call_dialog_number_for_display" msgid="696192103195090970">"ತುರ್ತು ಸಂಖ್ಯೆ"</string> <string name="lockscreen_carrier_default" msgid="6169005837238288522">"ಯಾವುದೇ ಸೇವೆಯಿಲ್ಲ"</string> - <string name="lockscreen_screen_locked" msgid="7288443074806832904">"ಪರದೆ ಲಾಕ್ ಆಗಿದೆ."</string> + <string name="lockscreen_screen_locked" msgid="7288443074806832904">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಗಿದೆ."</string> <string name="lockscreen_instructions_when_pattern_enabled" msgid="46154051614126049">"ಅನ್ಲಾಕ್ ಮಾಡಲು ಮೆನು ಒತ್ತಿರಿ ಇಲ್ಲವೇ ತುರ್ತು ಕರೆಯನ್ನು ಮಾಡಿ."</string> <string name="lockscreen_instructions_when_pattern_disabled" msgid="686260028797158364">"ಅನ್ಲಾಕ್ ಮಾಡಲು ಮೆನು ಒತ್ತಿರಿ."</string> <string name="lockscreen_pattern_instructions" msgid="7478703254964810302">"ಅನ್ಲಾಕ್ ಮಾಡಲು ಪ್ಯಾಟರ್ನ್ ಚಿತ್ರಿಸಿ"</string> <string name="lockscreen_emergency_call" msgid="5298642613417801888">"ತುರ್ತು"</string> <string name="lockscreen_return_to_call" msgid="5244259785500040021">"ಕರೆಗೆ ಹಿಂತಿರುಗು"</string> <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"ಸರಿಯಾಗಿದೆ!"</string> - <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"ಮತ್ತೆ ಪ್ರಯತ್ನಿಸು"</string> - <string name="lockscreen_password_wrong" msgid="5737815393253165301">"ಮತ್ತೆ ಪ್ರಯತ್ನಿಸು"</string> + <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ"</string> + <string name="lockscreen_password_wrong" msgid="5737815393253165301">"ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"ಗರಿಷ್ಠ ಫೇಸ್ ಅನ್ಲಾಕ್ ಪ್ರಯತ್ನಗಳು ಮೀರಿವೆ"</string> <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"ಯಾವುದೇ ಸಿಮ್ ಕಾರ್ಡ್ ಇಲ್ಲ"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"ಟ್ಯಾಬ್ಲೆಟ್ನಲ್ಲಿ ಸಿಮ್ ಕಾರ್ಡ್ ಇಲ್ಲ."</string> @@ -797,7 +797,7 @@ <string name="permdesc_writeHistoryBookmarks" product="tv" msgid="7007393823197766548">"ನಿಮ್ಮ ಟಿವಿಯಲ್ಲಿ ಸಂಗ್ರಹಿಸಲಾದ ಬ್ರೌಸರ್ನ ಇತಿಹಾಸ ಬುಕ್ಮಾರ್ಕ್ಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ. ಇದು ಬ್ರೌಸರ್ ಡೇಟಾವನ್ನು ಅಳಿಸಲು ಅಥವಾ ಮಾರ್ಪಡಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸಬಹುದು. ಗಮನಿಸಿ: ವೆಬ್ ಬ್ರೌಸಿಂಗ್ ಸಾಮರ್ಥ್ಯಗಳ ಜೊತೆಗೆ ಮೂರನೇ ವ್ಯಕ್ತಿಯ ಬ್ರೌಸರ್ಗಳ ಅಥವಾ ಇತರ ಅಪ್ಲಿಕೇಶನ್ಗಳ ಮೂಲಕ ಈ ಅನುಮತಿಯು ಕಾರ್ಯಗತಗೊಳಿಸದಿರಬಹುದು."</string> <string name="permdesc_writeHistoryBookmarks" product="default" msgid="8497389531014185509">"ನಿಮ್ಮ ಫೋನ್ನಲ್ಲಿ ಸಂಗ್ರಹಿಸಲಾಗಿರುವ ಬ್ರೌಸರ್ನ ಇತಿಹಾಸ ಅಥವಾ ಬುಕ್ಮಾರ್ಕ್ಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ. ಇದು ಬ್ರೌಸರ್ನ ಡೇಟಾವನ್ನು ಅಳಿಸಲು ಅಥವಾ ಮಾರ್ಪಡಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅವಕಾಶ ಕಲ್ಪಿಸಿಕೊಡಬಹುದು. ಗಮನಿಸಿ: ಈ ಅನುಮತಿಯನ್ನು ವೆಬ್ ಬ್ರೌಸಿಂಗ್ ಸಾಮರ್ಥ್ಯಗಳನ್ನು ಹೊಂದಿರುವ ಮೂರನೇ-ವ್ಯಕ್ತಿ ಬ್ರೌಸರ್ಗಳು ಅಥವಾ ಅಪ್ಲಿಕೇಶನ್ಗಳ ಮೂಲಕ ಜಾರಿಗೊಳಿಸಲಾಗುವುದಿಲ್ಲ."</string> <string name="permlab_setAlarm" msgid="1379294556362091814">"ಅಲಾರಮ್ ಹೊಂದಿಸಿ"</string> - <string name="permdesc_setAlarm" msgid="316392039157473848">"ಸ್ಥಾಪಿಸಲಾದ ಅಲಾರಂ ಗಡಿಯಾರ ಅಪ್ಲಿಕೇಶನ್ನಲ್ಲಿ ಅಲಾರಂ ಹೊಂದಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ. ಕೆಲವು ಅಲಾರಂ ಗಡಿಯಾರ ಅಪ್ಲಿಕೇಶನ್ಗಳು ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಕಾರ್ಯಗತಗೊಳಿಸದಿರಬಹುದು."</string> + <string name="permdesc_setAlarm" msgid="316392039157473848">"ಸ್ಥಾಪಿಸಲಾದ ಅಲಾರಮ್ ಗಡಿಯಾರ ಅಪ್ಲಿಕೇಶನ್ನಲ್ಲಿ ಅಲಾರಮ್ ಹೊಂದಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ. ಕೆಲವು ಅಲಾರಮ್ ಗಡಿಯಾರ ಅಪ್ಲಿಕೇಶನ್ಗಳು ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಕಾರ್ಯಗತಗೊಳಿಸದಿರಬಹುದು."</string> <string name="permlab_addVoicemail" msgid="5525660026090959044">"ಧ್ವನಿಮೇಲ್ ಸೇರಿಸಿ"</string> <string name="permdesc_addVoicemail" msgid="6604508651428252437">"ನಿಮ್ಮ ದ್ವನಿಮೇಲ್ ಇನ್ಬಾಕ್ಸ್ಗೆ ಸಂದೇಶಗಳನ್ನು ಸೇರಿಸಲು ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string> <string name="permlab_writeGeolocationPermissions" msgid="5962224158955273932">"ಬ್ರೌಸರ್ ಜಿಯೋಲೊಕೇಶನ್ ಅನುಮತಿಗಳನ್ನು ಮಾರ್ಪಡಿಸಿ"</string> @@ -891,6 +891,38 @@ <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g>ವ ನಲ್ಲಿ</item> <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>ವ ನಲ್ಲಿ</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ನಿಮಿಷಗಳ ಹಿಂದೆ</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ನಿಮಿಷಗಳ ಹಿಂದೆ</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ಗಂಟೆಗಳ ಹಿಂದೆ</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ಗಂಟೆಗಳ ಹಿಂದೆ</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ದಿನಗಳ ಹಿಂದೆ</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ದಿನಗಳ ಹಿಂದೆ</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ವರ್ಷಗಳ ಹಿಂದೆ</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ವರ್ಷಗಳ ಹಿಂದೆ</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ನಿಮಿಷಗಳಲ್ಲಿ</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ನಿಮಿಷಗಳಲ್ಲಿ </item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ಗಂಟೆಗಳಲ್ಲಿ</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ಗಂಟೆಗಳಲ್ಲಿ</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ದಿನಗಳಲ್ಲಿ</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ದಿನಗಳಲ್ಲಿ</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ವರ್ಷಗಳಲ್ಲಿ</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ವರ್ಷಗಳಲ್ಲಿ</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"ವೀಡಿಯೊ ಸಮಸ್ಯೆ"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"ಈ ಸಾಧನಲ್ಲಿ ಸ್ಟ್ರೀಮ್ ಮಾಡಲು ಈ ವೀಡಿಯೊ ಮಾನ್ಯವಾಗಿಲ್ಲ."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"ಈ ವೀಡಿಯೊ ಪ್ಲೇ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ."</string> @@ -952,9 +984,9 @@ <string name="whichImageCaptureApplication" msgid="3680261417470652882">"ಇದರ ಜೊತೆಗೆ ಚಿತ್ರ ಕ್ಯಾಪ್ಚರ್ ಮಾಡಿ"</string> <string name="whichImageCaptureApplicationNamed" msgid="8619384150737825003">"%1$s ಜೊತೆ ಚಿತ್ರ ಕ್ಯಾಪ್ಚರ್ ಮಾಡಿ"</string> <string name="whichImageCaptureApplicationLabel" msgid="6390303445371527066">"ಚಿತ್ರ ಕ್ಯಾಪ್ಚರ್ ಮಾಡಿ"</string> - <string name="alwaysUse" msgid="4583018368000610438">"ಈ ಕ್ರಿಯೆಗೆ ಡೀಫಾಲ್ಟ್ ಆಗಿ ಬಳಸಿ."</string> + <string name="alwaysUse" msgid="4583018368000610438">"ಈ ಕ್ರಿಯೆಗೆ ಡಿಫಾಲ್ಟ್ ಆಗಿ ಬಳಸಿ."</string> <string name="use_a_different_app" msgid="8134926230585710243">"ಬೇರೆಯ ಅಪ್ಲಿಕೇಶನ್ ಬಳಸಿ"</string> - <string name="clearDefaultHintMsg" msgid="3252584689512077257">"ಸಿಸ್ಟಂ ಸೆಟ್ಟಿಂಗ್ಗಳು > ಅಪ್ಲಿಕೇಶನ್ಗಳು > ಡೌನ್ಲೋಡ್ ಮಾಡಲಾದ ಡೀಫಾಲ್ಟ್ ಅನ್ನು ತೆರವುಗೊಳಿಸಿ."</string> + <string name="clearDefaultHintMsg" msgid="3252584689512077257">"ಸಿಸ್ಟಂ ಸೆಟ್ಟಿಂಗ್ಗಳು > ಅಪ್ಲಿಕೇಶನ್ಗಳು > ಡೌನ್ಲೋಡ್ ಮಾಡಲಾದ ಡಿಫಾಲ್ಟ್ ಅನ್ನು ತೆರವುಗೊಳಿಸಿ."</string> <string name="chooseActivity" msgid="7486876147751803333">"ಕ್ರಿಯೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string> <string name="chooseUsbActivity" msgid="6894748416073583509">"USB ಸಾಧನಕ್ಕೆ ಅಪ್ಲಿಕೇಶನ್ವೊಂದನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string> <string name="noApplications" msgid="2991814273936504689">"ಯಾವುದೇ ಅಪ್ಲಿಕೇಶನ್ಗಳು ಈ ಕ್ರಿಯೆಗಾಗಿ ಬದ್ಧತೆ ತೋರಿಸುವುದಿಲ್ಲ."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> ನಿಲ್ಲಿಸಿದೆ"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> ನಿಲ್ಲುತ್ತಲೇ ಇರುತ್ತದೆ"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> ನಿಲ್ಲುತ್ತಲೇ ಇರುತ್ತದೆ"</string> - <string name="aerr_restart" msgid="9001379185665886595">"ಅಪ್ಲಿಕೇಶನ್ ಮರುಪ್ರಾರಂಭಿಸಿ"</string> - <string name="aerr_reset" msgid="7645427603514220451">"ಅಪ್ಲಿಕೇಶನ್ ಮರುಹೊಂದಿಸಿ ಮತ್ತು ಮರುಪ್ರಾರಂಭಿಸಿ"</string> + <string name="aerr_restart" msgid="7581308074153624475">"ಅಪ್ಲಿಕೇಶನ್ ಮತ್ತೆ ತೆರೆಯಿರಿ"</string> <string name="aerr_report" msgid="5371800241488400617">"ಪ್ರತಿಕ್ರಿಯೆ ಕಳುಹಿಸು"</string> <string name="aerr_close" msgid="2991640326563991340">"ಮುಚ್ಚು"</string> <string name="aerr_mute" msgid="1974781923723235953">"ಸಾಧನವು ಮರುಪ್ರಾರಂಭವಾಗುವವರೆಗೂ ಮ್ಯೂಟ್ ಮಾಡಿ"</string> @@ -1014,7 +1045,7 @@ <string name="volume_music_hint_silent_ringtone_selected" msgid="8310739960973156272">"ಶಾಂತ ರಿಂಗ್ಟೋನ್ ಹೊಂದಿಸಲಾಗಿದೆ"</string> <string name="volume_call" msgid="3941680041282788711">"ಒಳ-ಕರೆಯ ವಾಲ್ಯೂಮ್"</string> <string name="volume_bluetooth_call" msgid="2002891926351151534">"ಬ್ಲೂಟೂತ್ ಒಳ-ಕರೆಯ ವಾಲ್ಯೂಮ್"</string> - <string name="volume_alarm" msgid="1985191616042689100">"ಅಲಾರಂ ವಾಲ್ಯೂಮ್"</string> + <string name="volume_alarm" msgid="1985191616042689100">"ಅಲಾರಮ್ ವಾಲ್ಯೂಮ್"</string> <string name="volume_notification" msgid="2422265656744276715">"ಅಧಿಸೂಚನೆಯ ವಾಲ್ಯೂಮ್"</string> <string name="volume_unknown" msgid="1400219669770445902">"ವಾಲ್ಯೂಮ್"</string> <string name="volume_icon_description_bluetooth" msgid="6538894177255964340">"ಬ್ಲೂಟೂತ್ ವಾಲ್ಯೂಮ್"</string> @@ -1022,34 +1053,34 @@ <string name="volume_icon_description_incall" msgid="8890073218154543397">"ಕರೆಯ ವಾಲ್ಯೂಮ್"</string> <string name="volume_icon_description_media" msgid="4217311719665194215">"ಮೀಡಿಯಾ ವಾಲ್ಯೂಮ್"</string> <string name="volume_icon_description_notification" msgid="7044986546477282274">"ಅಧಿಸೂಚನೆಯ ವಾಲ್ಯೂಮ್"</string> - <string name="ringtone_default" msgid="3789758980357696936">"ಡೀಫಾಲ್ಟ್ ರಿಂಗ್ಟೋನ್"</string> - <string name="ringtone_default_with_actual" msgid="8129563480895990372">"ಡೀಫಾಲ್ಟ್ ರಿಂಗ್ಟೋನ್ (<xliff:g id="ACTUAL_RINGTONE">%1$s</xliff:g>)"</string> + <string name="ringtone_default" msgid="3789758980357696936">"ಡಿಫಾಲ್ಟ್ ರಿಂಗ್ಟೋನ್"</string> + <string name="ringtone_default_with_actual" msgid="8129563480895990372">"ಡಿಫಾಲ್ಟ್ ರಿಂಗ್ಟೋನ್ (<xliff:g id="ACTUAL_RINGTONE">%1$s</xliff:g>)"</string> <string name="ringtone_silent" msgid="7937634392408977062">"ಯಾವುದೂ ಇಲ್ಲ"</string> <string name="ringtone_picker_title" msgid="3515143939175119094">"ರಿಂಗ್ಟೋನ್ಗಳು"</string> <string name="ringtone_unknown" msgid="5477919988701784788">"ಅಜ್ಞಾತ ರಿಂಗ್ಟೋನ್"</string> <plurals name="wifi_available" formatted="false" msgid="7900333017752027322"> - <item quantity="one">Wi-Fi ನೆಟ್ವರ್ಕ್ಗಳು ಲಭ್ಯವಿವೆ</item> - <item quantity="other">Wi-Fi ನೆಟ್ವರ್ಕ್ಗಳು ಲಭ್ಯವಿವೆ</item> + <item quantity="one">ವೈ-ಫೈ ನೆಟ್ವರ್ಕ್ಗಳು ಲಭ್ಯವಿವೆ</item> + <item quantity="other">ವೈ-ಫೈ ನೆಟ್ವರ್ಕ್ಗಳು ಲಭ್ಯವಿವೆ</item> </plurals> <plurals name="wifi_available_detailed" formatted="false" msgid="1140699367193975606"> - <item quantity="one">ಮುಕ್ತ Wi-Fi ನೆಟ್ವರ್ಕ್ಗಳು ಲಭ್ಯವಿವೆ</item> - <item quantity="other">ಮುಕ್ತ Wi-Fi ನೆಟ್ವರ್ಕ್ಗಳು ಲಭ್ಯವಿವೆ</item> + <item quantity="one">ಮುಕ್ತ ವೈ-ಫೈ ನೆಟ್ವರ್ಕ್ಗಳು ಲಭ್ಯವಿವೆ</item> + <item quantity="other">ಮುಕ್ತ ವೈ-ಫೈ ನೆಟ್ವರ್ಕ್ಗಳು ಲಭ್ಯವಿವೆ</item> </plurals> - <string name="wifi_available_sign_in" msgid="9157196203958866662">"Wi-Fi ನೆಟ್ವರ್ಕ್ಗೆ ಸೈನ್ ಇನ್ ಮಾಡಿ"</string> + <string name="wifi_available_sign_in" msgid="9157196203958866662">"ವೈ-ಫೈ ನೆಟ್ವರ್ಕ್ಗೆ ಸೈನ್ ಇನ್ ಮಾಡಿ"</string> <string name="network_available_sign_in" msgid="1848877297365446605">"ನೆಟ್ವರ್ಕ್ಗೆ ಸೈನ್ ಇನ್ ಮಾಡಿ"</string> <!-- no translation found for network_available_sign_in_detailed (8000081941447976118) --> <skip /> <string name="wifi_no_internet" msgid="8451173622563841546">"ವೈ-ಫೈ ಯಾವುದೇ ಇಂಟರ್ನೆಟ್ ಪ್ರವೇಶವನ್ನು ಹೊಂದಿಲ್ಲ"</string> <string name="wifi_no_internet_detailed" msgid="8083079241212301741">"ಆಯ್ಕೆಗಳಿಗೆ ಟ್ಯಾಪ್ ಮಾಡಿ"</string> - <string name="wifi_watchdog_network_disabled" msgid="7904214231651546347">"Wi-Fi ಗೆ ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ"</string> + <string name="wifi_watchdog_network_disabled" msgid="7904214231651546347">"ವೈ-ಫೈ ಗೆ ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ"</string> <string name="wifi_watchdog_network_disabled_detailed" msgid="5548780776418332675">" ಕಳಪೆ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ಹೊಂದಿದೆ."</string> <string name="wifi_connect_alert_title" msgid="8455846016001810172">"ಸಂಪರ್ಕವನ್ನು ಅನುಮತಿಸುವುದೇ?"</string> <string name="wifi_connect_alert_message" msgid="6451273376815958922">"%2$s ವೈಫೈ ನೆಟ್ವರ್ಕ್ಗೆ ಸಂಪರ್ಕಿಸಲು %1$s ಅಪ್ಲಿಕೇಶನ್ ಬಯಸುತ್ತದೆ"</string> <string name="wifi_connect_default_application" msgid="7143109390475484319">"ಅಪ್ಲಿಕೇಶನ್"</string> - <string name="wifi_p2p_dialog_title" msgid="97611782659324517">"Wi-Fi ಡೈರೆಕ್ಟ್"</string> - <string name="wifi_p2p_turnon_message" msgid="2909250942299627244">"Wi-Fi ಡೈರೆಕ್ಟ್ ಪ್ರಾರಂಭಿಸಿ. ಇದು Wi-Fi ಕ್ಲೈಂಟ್/ಹಾಟ್ಸ್ಪಾಟ್ ಅನ್ನು ಆಫ್ ಮಾಡುತ್ತದೆ."</string> - <string name="wifi_p2p_failed_message" msgid="3763669677935623084">"Wi-Fi ಡೈರೆಕ್ಟ್ ಪ್ರಾರಂಭಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ."</string> - <string name="wifi_p2p_enabled_notification_title" msgid="2068321881673734886">"Wi-Fi ಡೈರೆಕ್ಟ್ ಆನ್ ಆಗಿದೆ"</string> + <string name="wifi_p2p_dialog_title" msgid="97611782659324517">"ವೈ-ಫೈ ಡೈರೆಕ್ಟ್"</string> + <string name="wifi_p2p_turnon_message" msgid="2909250942299627244">"ವೈ-ಫೈ ಡೈರೆಕ್ಟ್ ಪ್ರಾರಂಭಿಸಿ. ಇದು ವೈ-ಫೈ ಕ್ಲೈಂಟ್/ಹಾಟ್ಸ್ಪಾಟ್ ಅನ್ನು ಆಫ್ ಮಾಡುತ್ತದೆ."</string> + <string name="wifi_p2p_failed_message" msgid="3763669677935623084">"ವೈ-ಫೈ ಡೈರೆಕ್ಟ್ ಪ್ರಾರಂಭಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ."</string> + <string name="wifi_p2p_enabled_notification_title" msgid="2068321881673734886">"ವೈ-ಫೈ ಡೈರೆಕ್ಟ್ ಆನ್ ಆಗಿದೆ"</string> <string name="wifi_p2p_enabled_notification_message" msgid="8064677407830620023">"ಸೆಟ್ಟಿಂಗ್ಗಳಿಗೆ ಟ್ಯಾಪ್ ಮಾಡಿ"</string> <string name="accept" msgid="1645267259272829559">"ಸ್ವೀಕರಿಸು"</string> <string name="decline" msgid="2112225451706137894">"ನಿರಾಕರಿಸು"</string> @@ -1059,9 +1090,9 @@ <string name="wifi_p2p_to_message" msgid="248968974522044099">"ಗೆ:"</string> <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"ಅಗತ್ಯವಿರುವ ಪಿನ್ ಟೈಪ್ ಮಾಡಿ:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"ಪಿನ್:"</string> - <string name="wifi_p2p_frequency_conflict_message" product="tablet" msgid="8012981257742232475">"ಟ್ಯಾಬ್ಲೆಟ್ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಗೆ ಸಂಪರ್ಕಗೊಂಡಿರುವಾಗ ಅದನ್ನು ತಾತ್ಕಾಲಿಕವಾಗಿ Wi-Fi ನಿಂದ ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಲಾಗುತ್ತದೆ"</string> - <string name="wifi_p2p_frequency_conflict_message" product="tv" msgid="3087858235069421128">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಗೆ ಸಂಪರ್ಕಗೊಳಿಸಿರುವಾಗ ಟಿವಿಯನ್ನು ತಾತ್ಕಾಲಿಕವಾಗಿ Wi-Fi ನಿಂದ ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಲಾಗಿರುತ್ತದೆ"</string> - <string name="wifi_p2p_frequency_conflict_message" product="default" msgid="7363907213787469151">"ಫೋನ್ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಗೆ ಸಂಪರ್ಕಗೊಂಡಿರುವಾಗ Wi-Fi ನಿಂದ ಅದು ತಾತ್ಕಾಲಿಕವಾಗಿ ಸಂಪರ್ಕ ಕಡಿತಗೊಳ್ಳುತ್ತದೆ"</string> + <string name="wifi_p2p_frequency_conflict_message" product="tablet" msgid="8012981257742232475">"ಟ್ಯಾಬ್ಲೆಟ್ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಗೆ ಸಂಪರ್ಕಗೊಂಡಿರುವಾಗ ಅದನ್ನು ತಾತ್ಕಾಲಿಕವಾಗಿ ವೈ-ಫೈ ನಿಂದ ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಲಾಗುತ್ತದೆ"</string> + <string name="wifi_p2p_frequency_conflict_message" product="tv" msgid="3087858235069421128">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಗೆ ಸಂಪರ್ಕಗೊಳಿಸಿರುವಾಗ ಟಿವಿಯನ್ನು ತಾತ್ಕಾಲಿಕವಾಗಿ ವೈ-ಫೈ ನಿಂದ ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಲಾಗಿರುತ್ತದೆ"</string> + <string name="wifi_p2p_frequency_conflict_message" product="default" msgid="7363907213787469151">"ಫೋನ್ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಗೆ ಸಂಪರ್ಕಗೊಂಡಿರುವಾಗ ವೈ-ಫೈ ನಿಂದ ಅದು ತಾತ್ಕಾಲಿಕವಾಗಿ ಸಂಪರ್ಕ ಕಡಿತಗೊಳ್ಳುತ್ತದೆ"</string> <string name="select_character" msgid="3365550120617701745">"ಅಕ್ಷರವನ್ನು ಸೇರಿಸಿ"</string> <string name="sms_control_title" msgid="7296612781128917719">"SMS ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸಲಾಗುತ್ತಿದೆ"</string> <string name="sms_control_message" msgid="3867899169651496433">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> ಹೆಚ್ಚಿನ ಸಂಖ್ಯೆಯ SMS ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸುತ್ತಿದೆ. ಸಂದೇಶಗಳ ಕಳುಹಿಸುವಿಕೆಯನ್ನು ಮುಂದುವರಿಸುವಂತೆ ಈ ಅಪ್ಲಿಕೇಶನ್ಗೆ ಅನುಮತಿಸಲು ನೀವು ಬಯಸುವಿರಾ?"</string> @@ -1206,8 +1237,8 @@ <string name="no_file_chosen" msgid="6363648562170759465">"ಯಾವುದೇ ಫೈಲ್ ಆಯ್ಕೆ ಮಾಡಿಲ್ಲ"</string> <string name="reset" msgid="2448168080964209908">"ಮರುಹೊಂದಿಸು"</string> <string name="submit" msgid="1602335572089911941">"ಸಲ್ಲಿಸು"</string> - <string name="car_mode_disable_notification_title" msgid="3164768212003864316">"ಕಾರ್ ಮೋಡ್ ಸಕ್ರಿಯವಾಗಿದೆ"</string> - <string name="car_mode_disable_notification_message" msgid="6301524980144350051">"ಕಾರ್ ಮೋಡ್ನಿಂದ ನಿರ್ಗಮಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string> + <string name="car_mode_disable_notification_title" msgid="3164768212003864316">"ಕಾರು ಮೋಡ್ ಸಕ್ರಿಯವಾಗಿದೆ"</string> + <string name="car_mode_disable_notification_message" msgid="6301524980144350051">"ಕಾರು ಮೋಡ್ನಿಂದ ನಿರ್ಗಮಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string> <string name="tethered_notification_title" msgid="3146694234398202601">"ಟೆಥರಿಂಗ್ ಅಥವಾ ಹಾಟ್ಸ್ಪಾಟ್ ಸಕ್ರಿಯವಾಗಿದೆ"</string> <string name="tethered_notification_message" msgid="2113628520792055377">"ಹೊಂದಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string> <string name="back_button_label" msgid="2300470004503343439">"ಹಿಂದೆ"</string> @@ -1238,7 +1269,7 @@ <string name="sync_undo_deletes" msgid="2941317360600338602">"ಅಳಿಸುವಿಕೆಯನ್ನು ರದ್ದುಗೊಳಿಸಿ"</string> <string name="sync_do_nothing" msgid="3743764740430821845">"ಈಗ ಏನೂ ಮಾಡಬೇಡಿ"</string> <string name="choose_account_label" msgid="5655203089746423927">"ಖಾತೆಯೊಂದನ್ನು ಆರಿಸು"</string> - <string name="add_account_label" msgid="2935267344849993553">"ಒಂದು ಖಾತೆ ಸೇರಿಸು"</string> + <string name="add_account_label" msgid="2935267344849993553">"ಒಂದು ಖಾತೆ ಸೇರಿಸಿ"</string> <string name="add_account_button_label" msgid="3611982894853435874">"ಖಾತೆ ಸೇರಿಸಿ"</string> <string name="number_picker_increment_button" msgid="2412072272832284313">"ಹೆಚ್ಚಿಸಿ"</string> <string name="number_picker_decrement_button" msgid="476050778386779067">"ಕಡಿಮೆ ಮಾಡಿ"</string> @@ -1290,12 +1321,12 @@ <string name="data_usage_3g_limit_title" msgid="4361523876818447683">"2G-3G ಡೇಟಾ ಮೀತಿಯನ್ನು ತಲುಪಿದೆ"</string> <string name="data_usage_4g_limit_title" msgid="4609566827219442376">"4G ಡೇಟಾ ಮೀತಿಯನ್ನು ತಲುಪಿದೆ"</string> <string name="data_usage_mobile_limit_title" msgid="557158376602636112">"ಸೆಲ್ಯುಲಾರ್ ಡೇಟಾ ಮಿತಿಯನ್ನು ತಲುಪಿದೆ"</string> - <string name="data_usage_wifi_limit_title" msgid="5803363779034792676">"Wi-Fi ಡೇಟಾ ಮಿತಿಯನ್ನು ತಲುಪಿದೆ"</string> + <string name="data_usage_wifi_limit_title" msgid="5803363779034792676">"ವೈ-ಫೈ ಡೇಟಾ ಮಿತಿಯನ್ನು ತಲುಪಿದೆ"</string> <string name="data_usage_limit_body" msgid="291731708279614081">"ಉಳಿದಿರುವ ಆವರ್ತನೆಗೆ ಡೇಟಾವನ್ನು ವಿರಾಮಗೊಳಿಸಲಾಗಿದೆ"</string> <string name="data_usage_3g_limit_snoozed_title" msgid="7026739121138005231">"2G-3G ಡೇಟಾ ಮಿತಿ ಮೀರಿದೆ"</string> <string name="data_usage_4g_limit_snoozed_title" msgid="1106562779311209039">"4G ಡೇಟಾ ಮಿತಿ ಮೀರಿದೆ"</string> <string name="data_usage_mobile_limit_snoozed_title" msgid="4941346653729943789">"ಸೆಲ್ಯುಲಾರ್ ಡೇಟಾ ಮಿತಿ ಮೀರಿದೆ"</string> - <string name="data_usage_wifi_limit_snoozed_title" msgid="8743856006384825974">"Wi-Fi ಡೇಟಾ ಮಿತಿ ಮೀರಿದೆ"</string> + <string name="data_usage_wifi_limit_snoozed_title" msgid="8743856006384825974">"ವೈ-ಫೈ ಡೇಟಾ ಮಿತಿ ಮೀರಿದೆ"</string> <string name="data_usage_limit_snoozed_body" msgid="7035490278298441767">"<xliff:g id="SIZE">%s</xliff:g> ನಿರ್ದಿಷ್ಟಪಡಿಸಿದ ಮಿತಿ ಮೀರಿದೆ."</string> <string name="data_usage_restricted_title" msgid="5965157361036321914">"ಹಿನ್ನೆಲೆ ಡೇಟಾವನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string> <string name="data_usage_restricted_body" msgid="469866376337242726">"ನಿರ್ಬಂಧವನ್ನು ತೆಗೆದುಹಾಕಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string> @@ -1311,8 +1342,8 @@ <string name="expires_on" msgid="3676242949915959821">"ಈ ದಿನಾಂಕದಂದು ಮುಕ್ತಾಯಗೊಳ್ಳುತ್ತದೆ:"</string> <string name="serial_number" msgid="758814067660862493">"ಕ್ರಮ ಸಂಖ್ಯೆ:"</string> <string name="fingerprints" msgid="4516019619850763049">"ಫಿಂಗರ್ ಪ್ರಿಂಟ್ಗಳು:"</string> - <string name="sha256_fingerprint" msgid="4391271286477279263">"SHA-256 ಫಿಂಗರ್ಪ್ರಿಂಟ್:"</string> - <string name="sha1_fingerprint" msgid="7930330235269404581">"SHA-1 ಫಿಂಗರ್ಪ್ರಿಂಟ್:"</string> + <string name="sha256_fingerprint" msgid="4391271286477279263">"SHA-256 ಬೆರಳಚ್ಚು:"</string> + <string name="sha1_fingerprint" msgid="7930330235269404581">"SHA-1 ಬೆರಳಚ್ಚು:"</string> <string name="activity_chooser_view_see_all" msgid="4292569383976636200">"ಎಲ್ಲವನ್ನೂ ನೋಡಿ"</string> <string name="activity_chooser_view_dialog_title_default" msgid="4710013864974040615">"ಚಟುವಟಿಕೆಯನ್ನು ಆರಿಸಿ"</string> <string name="share_action_provider_share_with" msgid="5247684435979149216">"ಹಂಚಿಕೊಳ್ಳಿ"</string> @@ -1349,7 +1380,7 @@ <string name="display_manager_overlay_display_secure_suffix" msgid="6022119702628572080">", ಸುರಕ್ಷಿತ"</string> <string name="kg_forgot_pattern_button_text" msgid="8852021467868220608">"ಪ್ಯಾಟರ್ನ್ ಅನ್ನು ಮರೆತಿರುವಿರಿ"</string> <string name="kg_wrong_pattern" msgid="1850806070801358830">"ತಪ್ಪು ಪ್ಯಾಟರ್ನ್"</string> - <string name="kg_wrong_password" msgid="2333281762128113157">"ತಪ್ಪಾದ ಪಾಸ್ವರ್ಡ್"</string> + <string name="kg_wrong_password" msgid="2333281762128113157">"ತಪ್ಪು ಪಾಸ್ವರ್ಡ್"</string> <string name="kg_wrong_pin" msgid="1131306510833563801">"ತಪ್ಪಾದ ಪಿನ್"</string> <string name="kg_too_many_failed_attempts_countdown" msgid="6358110221603297548">"<xliff:g id="NUMBER">%1$d</xliff:g> ಸೆಕೆಂಡುಗಳಲ್ಲಿ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string> <string name="kg_pattern_instructions" msgid="398978611683075868">"ನಿಮ್ಮ ನಮೂನೆಯನ್ನು ಚಿತ್ರಿಸಿ"</string> @@ -1515,7 +1546,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> ಅಳಿಸಲಾಗಿದೆ"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"ಕೆಲಸ <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"ಈ ಪರದೆಯನ್ನು ಅನ್ಪಿನ್ ಮಾಡಲು, ಸ್ಪರ್ಶಿಸಿ ಮತ್ತು ಹಿಂಂದೆ ಒತ್ತಿ ಹಿಡಿಯಿರಿ."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"ಈ ಪರದೆಯನ್ನು ಅನ್ಪಿನ್ ಮಾಡಲು, ಅವಲೋಕನವನ್ನು ಸ್ಪರ್ಶಿಸಿ ಮತ್ತು ಒತ್ತಿ ಹಿಡಿಯಿರಿ."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"ಅಪ್ಲಿಕೇಶನ್ ಪಿನ್ ಮಾಡಲಾಗಿದೆ: ಈ ಸಾಧನದಲ್ಲಿ ಅನ್ಪಿನ್ ಮಾಡುವುದನ್ನು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"ಸ್ಕ್ರೀನ್ ಪಿನ್ ಮಾಡಲಾಗಿದೆ"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"ಸ್ಕ್ರೀನ್ ಅನ್ಪಿನ್ ಮಾಡಲಾಗಿದೆ"</string> @@ -1582,6 +1612,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS ವಿನಂತಿಯನ್ನು USSD ವಿನಂತಿಗೆ ಮಾರ್ಪಡಿಸಲಾಗಿದೆ."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS ವಿನಂತಿಯನ್ನು ಹೊಸ SS ವಿನಂತಿಗೆ ಮಾರ್ಪಡಿಸಲಾಗಿದೆ."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"ವಿಸ್ತರಿಸು ಬಟನ್"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"ವಿಸ್ತರಣೆ ಟಾಗಲ್ ಮಾಡಿ"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB ಪೆರಿಪೆರಲ್ ಪೋರ್ಟ್"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB ಪೆರಿಪೆರಲ್ ಪೋರ್ಟ್"</string> @@ -1589,6 +1621,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"ಓವರ್ಫ್ಲೋ ಮುಚ್ಚು"</string> <string name="maximize_button_text" msgid="7543285286182446254">"ಹಿಗ್ಗಿಸು"</string> <string name="close_button_text" msgid="3937902162644062866">"ಮುಚ್ಚು"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ಆಯ್ಕೆಮಾಡಲಾಗಿದೆ</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ಆಯ್ಕೆಮಾಡಲಾಗಿದೆ</item> @@ -1621,4 +1655,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"ನಿರ್ಬಂಧಗಳು ಇಲ್ಲದೆಯೇ ಈ ಸಾಧನವನ್ನು ಬಳಸಲು ಫ್ಯಾಕ್ಟರಿ ಮರುಹೊಂದಿಸಿ"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"ಇನ್ನಷ್ಟು ತಿಳಿಯಲು ಸ್ಪರ್ಶಿಸಿ."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string> </resources> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index a286605fcec9..9dbec791b363 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -891,6 +891,38 @@ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>년 후</item> <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>년 후</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>분 전</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>분 전</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>시간 전</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>시간 전</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>일 전</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>일 전</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>년 전</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>년 전</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>분 후</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>분 후</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>시간 후</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>시간 후</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>일 후</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>일 후</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>년 후</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>년 후</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"영상 문제"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"이 기기로 스트리밍하기에 적합하지 않은 동영상입니다."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"동영상을 재생할 수 없습니다."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g>이(가) 중지됨"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g>이(가) 계속 중단됨"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g>이(가) 계속 중단됨"</string> - <string name="aerr_restart" msgid="9001379185665886595">"앱 다시 시작"</string> - <string name="aerr_reset" msgid="7645427603514220451">"앱 재설정 및 다시 시작"</string> + <string name="aerr_restart" msgid="7581308074153624475">"앱 다시 열기"</string> <string name="aerr_report" msgid="5371800241488400617">"의견 보내기"</string> <string name="aerr_close" msgid="2991640326563991340">"닫기"</string> <string name="aerr_mute" msgid="1974781923723235953">"기기가 다시 시작될 때까지 알림 끄기"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> 삭제됨"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"업무용 <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"이 화면을 고정 해제하려면 \'뒤로\'를 길게 터치합니다."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"이 화면을 고정 해제하려면 \'최근 사용\'을 길게 터치합니다."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"앱이 고정되었습니다. 이 기기에서는 고정 해제를 허용하지 않습니다."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"화면 고정됨"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"화면 고정 해제됨"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS 요청이 USSD 요청으로 수정됩니다."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS 요청이 새로운 SS 요청으로 수정됩니다."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"직장 프로필"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"펼치기 버튼"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"확장 전환"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB 주변기기 포트"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB 주변기기 포트"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"오버플로우 닫기"</string> <string name="maximize_button_text" msgid="7543285286182446254">"최대화"</string> <string name="close_button_text" msgid="3937902162644062866">"닫기"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g>개 선택됨</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g>개 선택됨</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"제한 없이 기기를 사용하기 위한 초기화"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"자세한 내용을 보려면 터치하세요."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> 사용 중지됨"</string> </resources> diff --git a/core/res/res/values-ky-rKG/strings.xml b/core/res/res/values-ky-rKG/strings.xml index 371b02346752..023fc5ecd31d 100644 --- a/core/res/res/values-ky-rKG/strings.xml +++ b/core/res/res/values-ky-rKG/strings.xml @@ -891,6 +891,38 @@ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ж. кийин</item> <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ж. кийин</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> мүнөт мурун</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> мүнөт мурун</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> саат мурун</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> саат мурун</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> күн мурун</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> күн мурун</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> жыл мурун</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> жыл мурун</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> мүнөттөн кийин</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> мүнөттөн кийин</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> сааттан кийин</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> сааттан кийин</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> күндөн кийин</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> күндөн кийин</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> жылдан кийин</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> жылдан кийин</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Видео маселеси"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Бул видеону ушул түзмөктө агылтып көрсөтүү мүмкүн эмес."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Бул видеону ойнотуу мүмкүн эмес."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> токтотулду"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> колдонмосу иштебей калып жатат"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> колдонмосу иштебей калып жатат"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Колдонмону кайра жүргүзүү"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Колдонмону баштапкы абалга келтирип, кайра жүргүзүү"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Колдонмону кайра ачуу"</string> <string name="aerr_report" msgid="5371800241488400617">"Жооп пикир жөнөтүү"</string> <string name="aerr_close" msgid="2991640326563991340">"Жабуу"</string> <string name="aerr_mute" msgid="1974781923723235953">"Түзмөк өчүрүлүп-күйгүзүлгүчө үнүн өчүрүү"</string> @@ -1515,7 +1546,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> өчүрүлдү"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"Жумуш <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Бул экранды бошотуу үчүн \"Артка\" баскычын басып, кармап туруңуз."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Бул экранды бошотуу үчүн \"Көз жүгүртүү\" баскычын басып, кармап туруңуз."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Колдонмо кадалган: Бул түзмөктө бошотууга уруксат жок."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Экран кадалды"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Экран бошотулду"</string> @@ -1582,6 +1612,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS сурамы USSD сурамына өзгөртүлдү."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS сурамы жаңы SS сурамына өзгөртүлдү."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Жумуш профили"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Жайып көрсөтүү баскычы"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"жайып көрсөтүү баскычын которуштуруу"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB Сырткы оюкча"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB Сырткы оюкча"</string> @@ -1589,6 +1621,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Ашып-ташууну жабуу"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Чоңойтуу"</string> <string name="close_button_text" msgid="3937902162644062866">"Жабуу"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> тандалды</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> тандалды</item> @@ -1621,4 +1655,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Бул түзмөктү чектөөсүз колдонуу үчүн аны баштапкы абалга келтириңиз"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Көбүрөөк билүү үчүн тийип коюңуз."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> өчүрүлдү"</string> </resources> diff --git a/core/res/res/values-lo-rLA/strings.xml b/core/res/res/values-lo-rLA/strings.xml index cf295a35fc60..8727747b8db8 100644 --- a/core/res/res/values-lo-rLA/strings.xml +++ b/core/res/res/values-lo-rLA/strings.xml @@ -606,7 +606,7 @@ <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY TDD"</string> <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"ໂທລະສັບມືຖືບ່ອນເຮັດວຽກ"</string> <string name="phoneTypeWorkPager" msgid="649938731231157056">"ເພກເຈີບ່ອນເຮັດວຽກ"</string> - <string name="phoneTypeAssistant" msgid="5596772636128562884">"ຜູ່ຊ່ວຍ"</string> + <string name="phoneTypeAssistant" msgid="5596772636128562884">"ຜູ້ຊ່ວຍ"</string> <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string> <string name="eventTypeCustom" msgid="7837586198458073404">"ກຳນົດເອງ"</string> <string name="eventTypeBirthday" msgid="2813379844211390740">"ວັນເດືອນປີເກີດ"</string> @@ -639,7 +639,7 @@ <string name="orgTypeOther" msgid="3951781131570124082">"ອື່ນໆ"</string> <string name="orgTypeCustom" msgid="225523415372088322">"ກຳນົດເອງ"</string> <string name="relationTypeCustom" msgid="3542403679827297300">"ກຳນົດເອງ"</string> - <string name="relationTypeAssistant" msgid="6274334825195379076">"ຜູ່ຊ່ວຍ"</string> + <string name="relationTypeAssistant" msgid="6274334825195379076">"ຜູ້ຊ່ວຍ"</string> <string name="relationTypeBrother" msgid="8757913506784067713">"ອ້າຍ-ນ້ອງ"</string> <string name="relationTypeChild" msgid="1890746277276881626">"ລູກ"</string> <string name="relationTypeDomesticPartner" msgid="6904807112121122133">"ຮຸ້ນສ່ວນພາຍໃນ"</string> @@ -891,6 +891,38 @@ <item quantity="other">ໃນ <xliff:g id="COUNT_1">%d</xliff:g>ປ</item> <item quantity="one">ໃນ <xliff:g id="COUNT_0">%d</xliff:g>ປ</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ນາທີກ່ອນ</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ນາທີກ່ອນ</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ຊົ່ວໂມງກ່ອນ</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ຊົ່ວໂມງກ່ອນ</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ມື້ກ່ອນ</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ມື້ກ່ອນ</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ປີກ່ອນ</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ປີກ່ອນ</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other">ໃນ <xliff:g id="COUNT_1">%d</xliff:g> ນາທີ</item> + <item quantity="one">ໃນ <xliff:g id="COUNT_0">%d</xliff:g> ນາທີ</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other">ໃນ <xliff:g id="COUNT_1">%d</xliff:g> ຊົ່ວໂມງ</item> + <item quantity="one">ໃນ <xliff:g id="COUNT_0">%d</xliff:g> ຊົ່ວໂມງ</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other">ໃນ <xliff:g id="COUNT_1">%d</xliff:g> ມື້</item> + <item quantity="one">ໃນ <xliff:g id="COUNT_0">%d</xliff:g> ມື້</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other">ໃນ <xliff:g id="COUNT_1">%d</xliff:g> ປີ</item> + <item quantity="one">ໃນ <xliff:g id="COUNT_0">%d</xliff:g> ປີ</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"ບັນຫາວິດີໂອ"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"ວິດີໂອນີ້ບໍ່ຖືກຕ້ອງສຳລັບການສະແດງໃນອຸປະກອນນີ້."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"ບໍ່ສາມາດຫຼິ້ນວິດີໂອນີ້ໄດ້."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> ໄດ້ຢຸດແລ້ວ"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> ຢຸດເລື້ອຍໆ"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> ຢຸດເລື້ອຍໆ"</string> - <string name="aerr_restart" msgid="9001379185665886595">"ເລີ່ມແອັບໃໝ່"</string> - <string name="aerr_reset" msgid="7645427603514220451">"ຣີເຊັດ ແລະ ເລີ່ມແອັບໃໝ່"</string> + <string name="aerr_restart" msgid="7581308074153624475">"ເປີດແອັບອີກຄັ້ງ"</string> <string name="aerr_report" msgid="5371800241488400617">"ສົ່ງຄຳຕິຊົມ"</string> <string name="aerr_close" msgid="2991640326563991340">"ປິດ"</string> <string name="aerr_mute" msgid="1974781923723235953">"ປິດສຽງຈົນກວ່າວ່າອຸປະກອນເລີ່ມໃໝ່"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> ຖືກລຶບແລ້ວ"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"ບ່ອນເຮັດວຽກ <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"ກົດປຸ່ມກັບຄືນຄ້າງໄວ້ເພື່ອເຊົາປັກໝຸດໜ້າຈໍນີ້."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"ກົດປຸ່ມພາບຮວມຄ້າງໄວ້ເພື່ອເຊົາປັກໝຸດໜ້າຈໍນີ້."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"ແອັບຖືກປັກໝຸດແລ້ວ: ບໍ່ອະນຸຍາດໃຫ້ຖອນປັກໝຸດຢູ່ເທິງອຸປະກອນນີ້."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"ປັກໝຸດໜ້າຈໍແລ້ວ"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"ຍົກເລີກການປັກໝຸນຫນ້າຈໍແລ້ວ"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"ການຂໍ SS ຖືກດັດແປງເປັນການຂໍ USSD ແລ້ວ."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"ການຂໍ SS ຖືກດັດແປງເປັນການຂໍ SS ໃໝ່ແລ້ວ."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"ໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"ປຸ່ມຂະຫຍາຍ"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"ປິດ/ເປີດ ການຂະຫຍາຍ"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"ຜອດຮອບນອກ Android USB"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"ຜອດຮອບນອກ USB"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"ປິດການໄຫຼລົ້ນອອກມາ"</string> <string name="maximize_button_text" msgid="7543285286182446254">"ຂະຫຍາຍອອກ"</string> <string name="close_button_text" msgid="3937902162644062866">"ປິດ"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ຖືກເລືອກແລ້ວ</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ຖືກເລືອກແລ້ວ</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"ຣີເຊັດໃຫ້ເປັນຄ່າໂຮງງານເພື່ອໃຊ້ອຸປະກອນນີ້ໂດຍບໍ່ມີຂໍ້ຈຳກັດ"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"ແຕະເພື່ອສຶກສາເພີ່ມເຕີມ."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"ປິດການນຳໃຊ້ <xliff:g id="LABEL">%1$s</xliff:g> ແລ້ວ"</string> </resources> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index 66d6bf86b446..f6a3283884d2 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -921,6 +921,54 @@ <item quantity="many">po <xliff:g id="COUNT_1">%d</xliff:g> m.</item> <item quantity="other">po <xliff:g id="COUNT_1">%d</xliff:g> m.</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="one">prieš <xliff:g id="COUNT_1">%d</xliff:g> minutę</item> + <item quantity="few">prieš <xliff:g id="COUNT_1">%d</xliff:g> minutes</item> + <item quantity="many">prieš <xliff:g id="COUNT_1">%d</xliff:g> minutės</item> + <item quantity="other">prieš <xliff:g id="COUNT_1">%d</xliff:g> minučių</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="one">prieš <xliff:g id="COUNT_1">%d</xliff:g> valandą</item> + <item quantity="few">prieš <xliff:g id="COUNT_1">%d</xliff:g> valandas</item> + <item quantity="many">prieš <xliff:g id="COUNT_1">%d</xliff:g> valandos</item> + <item quantity="other">prieš <xliff:g id="COUNT_1">%d</xliff:g> valandų</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="one">prieš <xliff:g id="COUNT_1">%d</xliff:g> dieną</item> + <item quantity="few">prieš <xliff:g id="COUNT_1">%d</xliff:g> dienas</item> + <item quantity="many">prieš <xliff:g id="COUNT_1">%d</xliff:g> dienos</item> + <item quantity="other">prieš <xliff:g id="COUNT_1">%d</xliff:g> dienų</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="one">prieš <xliff:g id="COUNT_1">%d</xliff:g> metus</item> + <item quantity="few">prieš <xliff:g id="COUNT_1">%d</xliff:g> metus</item> + <item quantity="many">prieš <xliff:g id="COUNT_1">%d</xliff:g> metų</item> + <item quantity="other">prieš <xliff:g id="COUNT_1">%d</xliff:g> metų</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="one">po <xliff:g id="COUNT_1">%d</xliff:g> minutės</item> + <item quantity="few">po <xliff:g id="COUNT_1">%d</xliff:g> minučių</item> + <item quantity="many">po <xliff:g id="COUNT_1">%d</xliff:g> minutės</item> + <item quantity="other">po <xliff:g id="COUNT_1">%d</xliff:g> minučių</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="one">po <xliff:g id="COUNT_1">%d</xliff:g> valandos</item> + <item quantity="few">po <xliff:g id="COUNT_1">%d</xliff:g> valandų</item> + <item quantity="many">po <xliff:g id="COUNT_1">%d</xliff:g> valandos</item> + <item quantity="other">po <xliff:g id="COUNT_1">%d</xliff:g> valandų</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="one">po <xliff:g id="COUNT_1">%d</xliff:g> dienos</item> + <item quantity="few">po <xliff:g id="COUNT_1">%d</xliff:g> dienų</item> + <item quantity="many">po <xliff:g id="COUNT_1">%d</xliff:g> dienos</item> + <item quantity="other">po <xliff:g id="COUNT_1">%d</xliff:g> dienų</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="one">po <xliff:g id="COUNT_1">%d</xliff:g> metų</item> + <item quantity="few">po <xliff:g id="COUNT_1">%d</xliff:g> metų</item> + <item quantity="many">po <xliff:g id="COUNT_1">%d</xliff:g> metų</item> + <item quantity="other">po <xliff:g id="COUNT_1">%d</xliff:g> metų</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Vaizdo įrašo problema"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Šis vaizdo įrašas netinkamas srautiniu būdu perduoti į šį įrenginį."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Negalima paleisti šio vaizdo įrašo."</string> @@ -992,8 +1040,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> sustabdytas"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"„<xliff:g id="APPLICATION">%1$s</xliff:g>“ vis sustabdoma"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"Procesas „<xliff:g id="PROCESS">%1$s</xliff:g>“ vis sustabdomas"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Paleisti programą iš naujo"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Nustatyti ir paleisti programą iš naujo"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Atidaryti programą dar kartą"</string> <string name="aerr_report" msgid="5371800241488400617">"Siųsti atsiliepimą"</string> <string name="aerr_close" msgid="2991640326563991340">"Uždaryti"</string> <string name="aerr_mute" msgid="1974781923723235953">"Ignoruoti, kol įrenginys bus paleistas iš naujo"</string> @@ -1550,7 +1597,6 @@ <string name="deleted_key" msgid="7659477886625566590">"Ištrinta: <xliff:g id="KEY">%1$s</xliff:g>"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"Darbo <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Kad atsegtumėte šį ekraną, palieskite ir palaikykite „Atgal“."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Kad atsegtumėte šį ekraną, palieskite ir palaikykite „Apžvalga“."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Programa prisegta: šiame įrenginyje negalima atsegti."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Ekrano prisegtas"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Ekranas atsegtas"</string> @@ -1633,6 +1679,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS užklausa pakeista į USSD užklausą."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS užklausa pakeista į naują SS užklausą."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Darbo profilis"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Išskleidimo mygtukas"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"perjungti išskleidimą"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"„Android“ USB išorinis prievadas"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB išorinis prievadas"</string> @@ -1640,6 +1688,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Uždaryti perpildymo sritį"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Padidinti"</string> <string name="close_button_text" msgid="3937902162644062866">"Uždaryti"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="one">Pasir. <xliff:g id="COUNT_1">%1$d</xliff:g> elem.</item> <item quantity="few">Pasir. <xliff:g id="COUNT_1">%1$d</xliff:g> elem.</item> @@ -1674,4 +1724,5 @@ <string name="negative_duration" msgid="5688706061127375131">"–<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Atkurkite gamyklinius nustatymus, kad galėtumėte naudoti šį įrenginį be apribojimų"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Palieskite, kad sužinotumėte daugiau."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Išj. valdiklis „<xliff:g id="LABEL">%1$s</xliff:g>“"</string> </resources> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index 71f2a0785816..339da745deb0 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -607,7 +607,7 @@ <string name="phoneTypeRadio" msgid="4093738079908667513">"Radio"</string> <string name="phoneTypeTelex" msgid="3367879952476250512">"Telekss"</string> <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY TDD"</string> - <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Mobilā tālruņa numurs darbā"</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Darba mobilais"</string> <string name="phoneTypeWorkPager" msgid="649938731231157056">"Darba peidžers"</string> <string name="phoneTypeAssistant" msgid="5596772636128562884">"Palīgs"</string> <string name="phoneTypeMms" msgid="7254492275502768992">"Multiziņa"</string> @@ -906,6 +906,46 @@ <item quantity="one">pēc <xliff:g id="COUNT_1">%d</xliff:g> g.</item> <item quantity="other">pēc <xliff:g id="COUNT_1">%d</xliff:g> g.</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="zero">pirms <xliff:g id="COUNT_1">%d</xliff:g> minūtēm</item> + <item quantity="one">pirms <xliff:g id="COUNT_1">%d</xliff:g> minūtes</item> + <item quantity="other">pirms <xliff:g id="COUNT_1">%d</xliff:g> minūtēm</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="zero">pirms <xliff:g id="COUNT_1">%d</xliff:g> stundām</item> + <item quantity="one">pirms <xliff:g id="COUNT_1">%d</xliff:g> stundas</item> + <item quantity="other">pirms <xliff:g id="COUNT_1">%d</xliff:g> stundām</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="zero">pirms <xliff:g id="COUNT_1">%d</xliff:g> dienām</item> + <item quantity="one">pirms <xliff:g id="COUNT_1">%d</xliff:g> dienas</item> + <item quantity="other">pirms <xliff:g id="COUNT_1">%d</xliff:g> dienām</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="zero">pirms <xliff:g id="COUNT_1">%d</xliff:g> gadiem</item> + <item quantity="one">pirms <xliff:g id="COUNT_1">%d</xliff:g> gada</item> + <item quantity="other">pirms <xliff:g id="COUNT_1">%d</xliff:g> gadiem</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="zero">pēc <xliff:g id="COUNT_1">%d</xliff:g> minūtēm</item> + <item quantity="one">pēc <xliff:g id="COUNT_1">%d</xliff:g> minūtes</item> + <item quantity="other">pēc <xliff:g id="COUNT_1">%d</xliff:g> minūtēm</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="zero">pēc <xliff:g id="COUNT_1">%d</xliff:g> stundām</item> + <item quantity="one">pēc <xliff:g id="COUNT_1">%d</xliff:g> stundas</item> + <item quantity="other">pēc <xliff:g id="COUNT_1">%d</xliff:g> stundām</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="zero">pēc <xliff:g id="COUNT_1">%d</xliff:g> dienām</item> + <item quantity="one">pēc <xliff:g id="COUNT_1">%d</xliff:g> dienas</item> + <item quantity="other">pēc <xliff:g id="COUNT_1">%d</xliff:g> dienām</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="zero">pēc <xliff:g id="COUNT_1">%d</xliff:g> gadiem</item> + <item quantity="one">pēc <xliff:g id="COUNT_1">%d</xliff:g> gada</item> + <item quantity="other">pēc <xliff:g id="COUNT_1">%d</xliff:g> gadiem</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Video problēma"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Šis video nav derīgs straumēšanai uz šo ierīci."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Nevar atskaņot šo video."</string> @@ -977,8 +1017,7 @@ <string name="aerr_process" msgid="6201597323218674729">"Lietotne <xliff:g id="PROCESS">%1$s</xliff:g> pārtrauca darboties."</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> atkārtoti pārtrauc darboties"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> atkārtoti pārtrauc darboties"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Restartēt lietotni"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Atiestatīt un restartēt lietotni"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Atkārtoti atvērt lietotni"</string> <string name="aerr_report" msgid="5371800241488400617">"Sūtīt atsauksmes"</string> <string name="aerr_close" msgid="2991640326563991340">"Aizvērt"</string> <string name="aerr_mute" msgid="1974781923723235953">"Nerādīt, līdz ierīce tiks restartēta"</string> @@ -1531,12 +1570,11 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> tika dzēsts."</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"Darbā: <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Lai atspraustu šo ekrānu, pieskarieties pogai “Atpakaļ” un turiet to."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Lai atspraustu šo ekrānu, pieskarieties pogai “Kopsavilkums” un turiet to."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Lietotne ir piesprausta. Atspraušana šajā ierīcē nav atļauta."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Ekrāns ir piesprausts"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Ekrāns ir atsprausts"</string> <string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Prasīt PIN kodu pirms atspraušanas"</string> - <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Pirms atspraušanas pieprasīt grafisko atslēgu"</string> + <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Pirms atspraušanas pieprasīt grafisko atsl."</string> <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Pirms atspraušanas pieprasīt paroli"</string> <string name="package_installed_device_owner" msgid="8420696545959087545">"Instalēja jūsu administrators"</string> <string name="package_updated_device_owner" msgid="8856631322440187071">"Atjaunināja administrators"</string> @@ -1606,6 +1644,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS pieprasījums ir mainīts uz USSD pieprasījumu."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS pieprasījums ir mainīts uz jaunu SS pieprasījumu."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Darba profils"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Poga Izvērst"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"izvērst/sakļaut"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB perifērijas ports"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB perifērijas ports"</string> @@ -1613,6 +1653,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Aizvērt pārpildes izvēlni"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Maksimizēt"</string> <string name="close_button_text" msgid="3937902162644062866">"Aizvērt"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="zero"><xliff:g id="COUNT_1">%1$d</xliff:g> atlasīti</item> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> atlasīts</item> @@ -1646,4 +1688,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Rūpnīcas datu atiestatīšana ierīces neierobežotai izmantošanai"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Pieskarieties, lai uzzinātu vairāk."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> atspējots"</string> </resources> diff --git a/core/res/res/values-mk-rMK/strings.xml b/core/res/res/values-mk-rMK/strings.xml index 2b36f1f9f5ad..7528921e84b3 100644 --- a/core/res/res/values-mk-rMK/strings.xml +++ b/core/res/res/values-mk-rMK/strings.xml @@ -69,8 +69,8 @@ <string name="meid" msgid="4841221237681254195">"MEID"</string> <string name="ClipMmi" msgid="6952821216480289285">"ID на дојдовен повикувач"</string> <string name="ClirMmi" msgid="7784673673446833091">"ID на појдовен повикувач"</string> - <string name="ColpMmi" msgid="3065121483740183974">"ИД на поврзана линија"</string> - <string name="ColrMmi" msgid="4996540314421889589">"Забрана на ИД на поврзана линија"</string> + <string name="ColpMmi" msgid="3065121483740183974">"ID на поврзана линија"</string> + <string name="ColrMmi" msgid="4996540314421889589">"Забрана на ID на поврзана линија"</string> <string name="CfMmi" msgid="5123218989141573515">"Проследување повик"</string> <string name="CwMmi" msgid="9129678056795016867">"Повик на чекање"</string> <string name="BaMmi" msgid="455193067926770581">"Забрана за повик"</string> @@ -355,9 +355,9 @@ <string name="permdesc_writeCalendar" product="tv" msgid="1273290605500902507">"Дозволува апликацијата да додава, отстранува и менува настани кои може да ги менувате на вашиот телевизор, вклучувајќи ги и оние на пријателите и соработниците. Ова може да ѝ дозволи на апликацијата да испраќа пораки кои изгледаат како да доаѓаат од сопствениците на календарот или да менува настани без знаење на сопствениците."</string> <string name="permdesc_writeCalendar" product="default" msgid="2324469496327249376">"Овозможува апликацијата да додава, отстранува, менува настани кои може да ги менувате на вашиот телефон, вклучувајќи ги и оние на пријатели или соработници. Ова може да овозможи апликацијата да праќа пораки за кои се чини дека доаѓаат од сопственици на календар или да менува настани без знаење на сопствениците."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"пристапи кон наредби на давателот на дополнителна локација"</string> - <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Овозможува апликацијата да пристапи кон дополнителни наредби на давател на локација. Ова може да овозможи апликацијата да го попечи функционирањето на ГПС или други извори на локација."</string> + <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Овозможува апликацијата да пристапи кон дополнителни наредби на давател на локација. Ова може да овозможи апликацијата да го попечи функционирањето на GPS или други извори на локација."</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"пристап до прецизната локација (GPS и врз база на мрежа)"</string> - <string name="permdesc_accessFineLocation" msgid="5295047563564981250">"Овозможува апликацијата да ја добие вашата точна локација со користење „Глобален систем за позиционирање (ГПС)“ или извори на локација, како што се мобилни кули и Wi-Fi. Овие услуги за локација мора да се вклучени и достапни за вашиот уред за апликацијата да ги користи. Апликациите може да го користат ова за да утврдат приближно каде се наоѓате и може дополнително да потрошат батерија."</string> + <string name="permdesc_accessFineLocation" msgid="5295047563564981250">"Овозможува апликацијата да ја добие вашата точна локација со користење „Глобален систем за позиционирање (GPS)“ или извори на локација, како што се мобилни кули и Wi-Fi. Овие услуги за локација мора да се вклучени и достапни за вашиот уред за апликацијата да ги користи. Апликациите може да го користат ова за да утврдат приближно каде се наоѓате и може дополнително да потрошат батерија."</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"пристап до приближната локација (врз база на мрежа)"</string> <string name="permdesc_accessCoarseLocation" msgid="2538200184373302295">"Овозможува апликацијата да ја добие вашата приближна локација. Оваа локација е изведена од услугите за локација со користење мрежа на извори на локација, како што се мобилни кули и Wi-Fi. Овие услуги за локација мора да се вклучени и достапни за вашиот уред за апликацијата да ги користи. Апликациите може да го користат ова за да утврдат приближно каде се наоѓате."</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"менува аудио поставки"</string> @@ -375,7 +375,7 @@ <string name="permlab_accessImsCallService" msgid="3574943847181793918">"пристапи до услугата за повици IMS"</string> <string name="permdesc_accessImsCallService" msgid="8992884015198298775">"Дозволува апликацијата да ја користи услугата IMS за повици без ваша интервенција."</string> <string name="permlab_readPhoneState" msgid="9178228524507610486">"прочитај ги статусот и идентитетот на телефонот"</string> - <string name="permdesc_readPhoneState" msgid="1639212771826125528">"Овозможува апликацијата да пристапи кон карактеристиките на телефонот на уредот. Оваа дозвола овозможува апликацијата да ги утврди телефонскиот број и ИД на уредот, дали повикот е активен и далечинскиот број поврзан со повикот."</string> + <string name="permdesc_readPhoneState" msgid="1639212771826125528">"Овозможува апликацијата да пристапи кон карактеристиките на телефонот на уредот. Оваа дозвола овозможува апликацијата да ги утврди телефонскиот број и ID на уредот, дали повикот е активен и далечинскиот број поврзан со повикот."</string> <string name="permlab_wakeLock" product="tablet" msgid="1531731435011495015">"спречи режим на штедење кај таблет"</string> <string name="permlab_wakeLock" product="tv" msgid="2601193288949154131">"спречи го телевизорот да премине во режим на мирување"</string> <string name="permlab_wakeLock" product="default" msgid="573480187941496130">"спречи телефон од режим на штедење"</string> @@ -429,7 +429,7 @@ <string name="permdesc_bluetooth" product="tv" msgid="3974124940101104206">"Дозволете ѝ на апликацијата да ја прикаже конфигурацијата на Bluetooth на телевизорот и да воспоставува и прифаќа врски со спарените уреди."</string> <string name="permdesc_bluetooth" product="default" msgid="3207106324452312739">"Овозможува апликацијата да ја види конфигурацијата на Bluetooth на телефонот и да прави и да прифаќа врски со спарени уреди."</string> <string name="permlab_nfc" msgid="4423351274757876953">"контролирај комуникација на блиско поле"</string> - <string name="permdesc_nfc" msgid="7120611819401789907">"Дозволува апликацијата да комуницира со ознаки, картички и читачи за Комуникација при непосредна близина (НФЦ)."</string> + <string name="permdesc_nfc" msgid="7120611819401789907">"Дозволува апликацијата да комуницира со ознаки, картички и читачи за Комуникација при непосредна близина (NFC)."</string> <string name="permlab_disableKeyguard" msgid="3598496301486439258">"оневозможи заклучување на екран"</string> <string name="permdesc_disableKeyguard" msgid="6034203065077122992">"Овозможува апликацијата да го оневозможи заклучувањето и каква било безбедност поврзана со лозинка. На пример, телефонот го оневозможува заклучувањето при прием на телефонски повик, а потоа повторно го овозможува заклучувањето кога повикот ќе заврши."</string> <string name="permlab_manageFingerprint" msgid="5640858826254575638">"управувај хардвер за отпечатоци"</string> @@ -891,6 +891,38 @@ <item quantity="one">за <xliff:g id="COUNT_1">%d</xliff:g>г.</item> <item quantity="other">за <xliff:g id="COUNT_1">%d</xliff:g>г.</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="one">пред <xliff:g id="COUNT_1">%d</xliff:g> минута</item> + <item quantity="other">пред <xliff:g id="COUNT_1">%d</xliff:g> минути</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="one">пред <xliff:g id="COUNT_1">%d</xliff:g> час</item> + <item quantity="other">пред <xliff:g id="COUNT_1">%d</xliff:g> часа</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="one">пред <xliff:g id="COUNT_1">%d</xliff:g> ден</item> + <item quantity="other">пред <xliff:g id="COUNT_1">%d</xliff:g> дена</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="one">пред <xliff:g id="COUNT_1">%d</xliff:g> година</item> + <item quantity="other">пред <xliff:g id="COUNT_1">%d</xliff:g> години</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="one">за <xliff:g id="COUNT_1">%d</xliff:g> минута</item> + <item quantity="other">за <xliff:g id="COUNT_1">%d</xliff:g> минути</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="one">за <xliff:g id="COUNT_1">%d</xliff:g> час</item> + <item quantity="other">за <xliff:g id="COUNT_1">%d</xliff:g> часа</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="one">за <xliff:g id="COUNT_1">%d</xliff:g> ден</item> + <item quantity="other">за <xliff:g id="COUNT_1">%d</xliff:g> дена</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="one">за <xliff:g id="COUNT_1">%d</xliff:g> година</item> + <item quantity="other">за <xliff:g id="COUNT_1">%d</xliff:g> години</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Проблем со видео"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Видеово не е важечко за постојан тек до уредов."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Ова видео не може да се пушти."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> запре"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> постојано запира"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> постојано запира"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Рестартирај ја апликацијата"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Ресетирај ја и рестартирај ја апликацијата"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Отвори ја апликацијата повторно"</string> <string name="aerr_report" msgid="5371800241488400617">"Испрати повратни информации"</string> <string name="aerr_close" msgid="2991640326563991340">"Затвори"</string> <string name="aerr_mute" msgid="1974781923723235953">"Исклучи го звукот додека уредот не се рестартира"</string> @@ -1517,12 +1548,11 @@ <string name="deleted_key" msgid="7659477886625566590">"Избришано <xliff:g id="KEY">%1$s</xliff:g>"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"Работа <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"За откачување на екранов, допрете и задржете Назад."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"За откачување на екранов, допрете и задржете Краток преглед."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Апликацијата е закачена: откачување не е дозволено на уредов."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Екранот е закачен"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Екранот е откачен"</string> <string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Прашај за PIN пред откачување"</string> - <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Прашај за шема за отклучување пред откачување"</string> + <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Побарај шема за откл. пред откачување"</string> <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Прашај за лозинка пред откачување"</string> <string name="package_installed_device_owner" msgid="8420696545959087545">"Инсталирано од администраторот"</string> <string name="package_updated_device_owner" msgid="8856631322440187071">"Ажурирано од администраторот"</string> @@ -1584,6 +1614,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Барањето SS е изменето во барање USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Барањето SS е изменето во ново барање SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Работен профил"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Копче Прошири"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"вклучи/исклучи проширување"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Надворешна порта на УСБ за Android"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"Надворешна порта на УСБ"</string> @@ -1591,6 +1623,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Затвори прелевање"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Зголеми"</string> <string name="close_button_text" msgid="3937902162644062866">"Затвори"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> е избрана</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> се избрани</item> @@ -1623,4 +1657,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Ресетирајте до фабричките поставки за уредов да го користите без ограничувања"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Допрете за да дознаете повеќе."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Оневозможен <xliff:g id="LABEL">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-ml-rIN/strings.xml b/core/res/res/values-ml-rIN/strings.xml index ec212382c1f2..ebc5216900d9 100644 --- a/core/res/res/values-ml-rIN/strings.xml +++ b/core/res/res/values-ml-rIN/strings.xml @@ -208,7 +208,7 @@ <string name="reboot_safemode_title" msgid="7054509914500140361">"സുരക്ഷിത മോഡിലേക്ക് റീബൂട്ടുചെയ്യുക"</string> <string name="reboot_safemode_confirm" msgid="55293944502784668">"സുരക്ഷിത മോഡിലേക്ക് റീബൂട്ട് ചെയ്യണോ? ഇത് നിങ്ങൾ ഇൻസ്റ്റാളുചെയ്ത മൂന്നാം കക്ഷി അപ്ലിക്കേഷനുകളെയെല്ലാം പ്രവർത്തനരഹിതമാക്കും. നിങ്ങൾ വീണ്ടും റീബൂട്ടുചെയ്യുമ്പോൾ അവ പുനസ്ഥാപിക്കപ്പെടും."</string> <string name="recent_tasks_title" msgid="3691764623638127888">"അടുത്തിടെയുള്ളത്"</string> - <string name="no_recent_tasks" msgid="8794906658732193473">"അടുത്തിടെയുള്ള അപ്ലിക്കേഷനുകളൊന്നുമില്ല."</string> + <string name="no_recent_tasks" msgid="8794906658732193473">"അടുത്തിടെയുള്ള ആപ്സൊന്നുമില്ല."</string> <string name="global_actions" product="tablet" msgid="408477140088053665">"ടാബ്ലെറ്റ് ഓപ്ഷനുകൾ"</string> <string name="global_actions" product="tv" msgid="7240386462508182976">"ടിവി ഓപ്ഷനുകൾ"</string> <string name="global_actions" product="default" msgid="2406416831541615258">"ഫോൺ ഓപ്ഷനുകൾ"</string> @@ -819,7 +819,7 @@ <string name="searchview_description_query" msgid="5911778593125355124">"തിരയൽ അന്വേഷണം"</string> <string name="searchview_description_clear" msgid="1330281990951833033">"അന്വേഷണം മായ്ക്കുക"</string> <string name="searchview_description_submit" msgid="2688450133297983542">"ചോദ്യം സമർപ്പിക്കുക"</string> - <string name="searchview_description_voice" msgid="2453203695674994440">"ശബ്ദ തിരയൽ"</string> + <string name="searchview_description_voice" msgid="2453203695674994440">"ശബ്ദതിരയൽ"</string> <string name="enable_explore_by_touch_warning_title" msgid="7460694070309730149">"ടച്ച് വഴി പര്യവേക്ഷണം ചെയ്യൽ പ്രവർത്തനക്ഷമമാക്കണോ?"</string> <string name="enable_explore_by_touch_warning_message" product="tablet" msgid="8655887539089910577">"ടച്ച് വഴി പര്യവേക്ഷണം ചെയ്യൽ പ്രവർത്തനക്ഷമമാക്കാൻ <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> താൽപ്പര്യപ്പെടുന്നു. ടച്ച് വഴി പര്യവേക്ഷണം ചെയ്യൽ ഓൺ ചെയ്യുമ്പോൾ, നിങ്ങളുടെ വിരലിനടിയിലുള്ളവയുടെ വിവരണം കേൾക്കാനോ കാണാനോ അല്ലെങ്കിൽ ടാബ്ലെറ്റുമായി സംവദിക്കുന്ന ജെസ്റ്ററുകൾ നിർവഹിക്കാനോ കഴിയും."</string> <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"ടച്ച് വഴി പര്യവേക്ഷണം ചെയ്യൽ പ്രവർത്തനക്ഷമമാക്കാൻ <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> താൽപ്പര്യപ്പെടുന്നു. ടച്ച് വഴി പര്യവേക്ഷണം ചെയ്യൽ ഓൺ ചെയ്യുമ്പോൾ, നിങ്ങളുടെ വിരലിനടിയിലുള്ളവയുടെ വിവരണം കേൾക്കാനോ കാണാനോ അല്ലെങ്കിൽ ഫോണുമായി സംവദിക്കുന്ന ജെസ്റ്ററുകൾ നിർവഹിക്കാനോ കഴിയും."</string> @@ -891,6 +891,38 @@ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>വർഷത്തിൽ</item> <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>വർഷത്തിൽ</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> മിനിറ്റ് മുമ്പ്</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> മിനിറ്റ് മുമ്പ്</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> മണിക്കൂർ മുമ്പ്</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> മണിക്കൂർ മുമ്പ്</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ദിവസം മുമ്പ്</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ദിവസം മുമ്പ്</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> വർഷം മുമ്പ്</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> വർഷം മുമ്പ്</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> മിനിറ്റിൽ</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> മിനിറ്റിൽ</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> മണിക്കൂറിൽ</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> മണിക്കൂറിൽ</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ദിവസത്തിൽ</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ദിവസത്തിൽ</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> വർഷത്തിൽ</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> വർഷത്തിൽ</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"വീഡിയോ പ്രശ്നം"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"ഈ വീഡിയോ ഈ ഉപകരണത്തിൽ സ്ട്രീം ചെയ്യുന്നതിന് സാധുവായതല്ല."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"ഈ വീഡിയോ പ്ലേ ചെയ്യാനായില്ല."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> നിലച്ചിരിക്കുന്നു"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> നിലയ്ക്കുന്നത് തുടരുന്നു"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> നിലയ്ക്കുന്നത് തുടരുന്നു"</string> - <string name="aerr_restart" msgid="9001379185665886595">"ആപ്പ് പുനഃരാരംഭിക്കുക"</string> - <string name="aerr_reset" msgid="7645427603514220451">"ആപ്പ് പുനഃക്രമീകരിച്ച് പുനഃരാരംഭിക്കുക"</string> + <string name="aerr_restart" msgid="7581308074153624475">"ആപ്പ് വീണ്ടും തുറക്കുക"</string> <string name="aerr_report" msgid="5371800241488400617">"ഫീഡ്ബാക്ക് അയയ്ക്കുക"</string> <string name="aerr_close" msgid="2991640326563991340">"അടയ്ക്കുക"</string> <string name="aerr_mute" msgid="1974781923723235953">"ഉപകരണം പുനഃരാരംഭിക്കുന്നത് വരെ മ്യൂട്ടുചെയ്യുക"</string> @@ -1515,13 +1546,12 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> ഇല്ലാതാക്കി"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"ഔദ്യോഗികം <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"ഈ സ്ക്രീൻ അൺപിൻ ചെയ്യാൻ, ബാക്ക് ബട്ടൺ സ്പർശിച്ച് പിടിക്കുക"</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"ഈ സ്ക്രീൻ അൺപിൻ ചെയ്യാൻ, ചുരുക്കവിവരണം സ്പർശിച്ച് പിടിക്കുക."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"അപ്ലിക്കേഷൻ പിൻ ചെയ്തു: ഈ ഉപകരണത്തിൽ അൺപിൻ ചെയ്യാനാവില്ല."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"സ്ക്രീൻ പിൻ ചെയ്തു"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"സ്ക്രീൻ അൺപിൻ ചെയ്തു"</string> <string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"ചെയ്യുംമുമ്പ് പിൻ ചോദിക്കൂ"</string> - <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"അൺപിൻ ചെയ്യുന്നതിനുമുമ്പ് അൺലോക്ക് പാറ്റേൺ ആവശ്യപ്പെടുക"</string> - <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"അൺപിൻ ചെയ്യുന്നതിനുമുമ്പ് പാസ്വേഡ് ആവശ്യപ്പെടുക"</string> + <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"അൺപിന്നിനുമുമ്പ് അൺലോക്ക് പാറ്റേൺ ആവശ്യപ്പെടൂ"</string> + <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"അൺപിന്നിനുമുമ്പ് പാസ്വേഡ് ആവശ്യപ്പെടൂ"</string> <string name="package_installed_device_owner" msgid="8420696545959087545">"നിങ്ങളുടെ അഡ്മിനിസ്ട്രേറ്റർ ഇൻസ്റ്റാളുചെയ്തു"</string> <string name="package_updated_device_owner" msgid="8856631322440187071">"നിങ്ങളുടെ അഡ്മിനിസ്ട്രേറ്റർ അപ്ഡേറ്റുചെയ്തു"</string> <string name="package_deleted_device_owner" msgid="7650577387493101353">"നിങ്ങളുടെ അഡ്മിനിസ്ട്രേറ്റർ ഇല്ലാതാക്കി"</string> @@ -1582,6 +1612,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS അഭ്യർത്ഥന, USSD അഭ്യർത്ഥനയായി പരിഷ്ക്കരിച്ചു."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS അഭ്യർത്ഥന, പുതിയ SS അഭ്യർത്ഥനയായി പരിഷ്ക്കരിച്ചു."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"ഔദ്യോഗിക പ്രൊഫൈൽ"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"\'വികസിപ്പിക്കുക\' ബട്ടൺ"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"വികസിപ്പിക്കൽ ടോഗിൾ ചെയ്യുക"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB പെരിഫറൽ പോർട്ട്"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB പെരിഫറൽ പോർട്ട്"</string> @@ -1589,6 +1621,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"ഓവർഫ്ലോ അടയ്ക്കുക"</string> <string name="maximize_button_text" msgid="7543285286182446254">"വലുതാക്കുക"</string> <string name="close_button_text" msgid="3937902162644062866">"അടയ്ക്കുക"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> തിരഞ്ഞെടുത്തു</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> തിരഞ്ഞെടുത്തു</item> @@ -1621,4 +1655,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"നിയന്ത്രണങ്ങൾ ഇല്ലാതെ ഈ ഉപകരണം ഉപയോഗിക്കാൻ ഫാക്ടറി റീസെറ്റ് നടത്തുക"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"കൂടുതലറിയുന്നതിന് സ്പർശിക്കുക."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> പ്രവർത്തനരഹിതമാക്കി"</string> </resources> diff --git a/core/res/res/values-mn-rMN/strings.xml b/core/res/res/values-mn-rMN/strings.xml index 06634767d2dd..dee1661c97d7 100644 --- a/core/res/res/values-mn-rMN/strings.xml +++ b/core/res/res/values-mn-rMN/strings.xml @@ -260,7 +260,7 @@ <string name="permgroupdesc_phone" msgid="6234224354060641055">"утасны дуудлага хийх, дуудлага удирдах"</string> <string name="permgrouplab_sensors" msgid="416037179223226722">"Биеийн мэдрэгч"</string> <string name="permgroupdesc_sensors" msgid="7147968539346634043">"таны биеийн байдлын талаарх мэдрэгч бүхий өгөгдөлд нэвтрэх"</string> - <string name="capability_title_canRetrieveWindowContent" msgid="3901717936930170320">"Цонхны контентыг авах"</string> + <string name="capability_title_canRetrieveWindowContent" msgid="3901717936930170320">"Цонхны агуулгыг авах"</string> <string name="capability_desc_canRetrieveWindowContent" msgid="3772225008605310672">"Таны харилцан үйлчлэх цонхны контентоос шалгах."</string> <string name="capability_title_canRequestTouchExploration" msgid="3108723364676667320">"Хүрч танихыг асаах"</string> <string name="capability_desc_canRequestTouchExploration" msgid="7543249041581408313">"Товшсон зүйлсийг чангаар хэлэх ба дэлгэцийг дохио ашиглан таних боломжтой."</string> @@ -459,12 +459,12 @@ <string name="permdesc_writeSyncSettings" msgid="8956262591306369868">"Апп нь акаунтын синк тохиргоог өөрчлөх боломжтой. Жишээ нь энэ нь Хүмүүс апп акаунттай синк хийхийг идэвхжүүлэх боломжтой."</string> <string name="permlab_readSyncStats" msgid="7396577451360202448">"синк статистикийг унших"</string> <string name="permdesc_readSyncStats" msgid="1510143761757606156">"Апп нь синк үйлдэлийн түүх болон хэр их дата синк хийгдсэн зэрэг акаунтын синк статусыг унших боломжтой."</string> - <string name="permlab_sdcardRead" product="nosdcard" msgid="367275095159405468">"таны USB сангийн контентыг унших боломжтой"</string> - <string name="permlab_sdcardRead" product="default" msgid="2188156462934977940">"таны SD картны контентыг унших боломжтой"</string> - <string name="permdesc_sdcardRead" product="nosdcard" msgid="3446988712598386079">"Апп нь таны USB сангийн контентыг унших боломжтой."</string> - <string name="permdesc_sdcardRead" product="default" msgid="2607362473654975411">"Апп нь таны SD картны контентыг унших боломжтой."</string> - <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"USB сангийн контентыг өөрчлөх эсвэл устгах"</string> - <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"SD картны контентыг өөрчлөх болон устгах"</string> + <string name="permlab_sdcardRead" product="nosdcard" msgid="367275095159405468">"таны USB сангийн агуулгыг унших боломжтой"</string> + <string name="permlab_sdcardRead" product="default" msgid="2188156462934977940">"таны SD картны агуулгыг унших боломжтой"</string> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3446988712598386079">"Апп нь таны USB сангийн агуулгыг унших боломжтой."</string> + <string name="permdesc_sdcardRead" product="default" msgid="2607362473654975411">"Апп нь таны SD картны агуулгыг унших боломжтой."</string> + <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"USB сангийн агуулгыг өөрчлөх эсвэл устгах"</string> + <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"SD картны агуулгыг өөрчлөх болон устгах"</string> <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6175406299445710888">"Апп нь USB санруу бичих боломжтой."</string> <string name="permdesc_sdcardWrite" product="default" msgid="4337417790936632090">"Апп нь SD картруу бичих боломжтой."</string> <string name="permlab_use_sip" msgid="2052499390128979920">"SIP дуудлага хийх/хүлээн авах"</string> @@ -597,7 +597,7 @@ <string name="phoneTypeOther" msgid="1544425847868765990">"Бусад"</string> <string name="phoneTypeCallback" msgid="2712175203065678206">"Буцаж холбоо барих"</string> <string name="phoneTypeCar" msgid="8738360689616716982">"Машин"</string> - <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Байгууллагын үндсэн"</string> + <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Компаний үндсэн"</string> <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string> <string name="phoneTypeMain" msgid="6766137010628326916">"Үндсэн"</string> <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Бусад факс"</string> @@ -714,7 +714,7 @@ <string name="lockscreen_failed_attempts_now_wiping" product="default" msgid="3025504721764922246">"Та утсыг тайлах гэж <xliff:g id="NUMBER">%d</xliff:g> удаа буруу оролдлоо. Утас одоо үйлдвэрийн үндсэн утгаараа тохируулагдах болно."</string> <string name="lockscreen_too_many_failed_attempts_countdown" msgid="6251480343394389665">"<xliff:g id="NUMBER">%d</xliff:g> секундын дараа дахин оролдоно уу."</string> <string name="lockscreen_forgot_pattern_button_text" msgid="2626999449610695930">"Хээг мартсан уу?"</string> - <string name="lockscreen_glogin_forgot_pattern" msgid="2588521501166032747">"Акаунт тайлах"</string> + <string name="lockscreen_glogin_forgot_pattern" msgid="2588521501166032747">"Бүртгэл тайлах"</string> <string name="lockscreen_glogin_too_many_attempts" msgid="2751368605287288808">"Хээ оруулах оролдлого хэт олон"</string> <string name="lockscreen_glogin_instructions" msgid="3931816256100707784">"Түгжээг тайлах бол Google акаунтаараа нэвтэрнэ үү."</string> <string name="lockscreen_glogin_username_hint" msgid="8846881424106484447">"Хэрэглэгч (имэйл)"</string> @@ -891,6 +891,38 @@ <item quantity="other"> <xliff:g id="COUNT_1">%d</xliff:g>жилд</item> <item quantity="one"> <xliff:g id="COUNT_0">%d</xliff:g>жилд</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> минутын өмнө</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> минутын өмнө</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> цагийн өмнө</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> цагийн өмнө</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> өдрийн өмнө</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> өдрийн өмнө</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> жилийн өмнө</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> жилийн өмнө</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other"> <xliff:g id="COUNT_1">%d</xliff:g> минутад</item> + <item quantity="one"> <xliff:g id="COUNT_0">%d</xliff:g> минутад</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other"> <xliff:g id="COUNT_1">%d</xliff:g> цагт</item> + <item quantity="one"> <xliff:g id="COUNT_0">%d</xliff:g> цагт</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other"> <xliff:g id="COUNT_1">%d</xliff:g> өдөрт</item> + <item quantity="one"> <xliff:g id="COUNT_0">%d</xliff:g> өдөрт</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other"> <xliff:g id="COUNT_1">%d</xliff:g> жилд</item> + <item quantity="one"> <xliff:g id="COUNT_0">%d</xliff:g> жилд</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Видео алдаа"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Энэ видео энэ төхөөрөмж дээр урсгалаар гарч чадахгүй."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Энэ видеог тоглуулах боломжгүй."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> зогсчихлоо"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> зогссоор байна"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> зогссоор байна"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Апп-ыг дахин эхлүүлэх"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Апп-ыг шинэчилж, дахин эхлүүлэх"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Апп-г дахин нээх"</string> <string name="aerr_report" msgid="5371800241488400617">"Санал хүсэлт илгээх"</string> <string name="aerr_close" msgid="2991640326563991340">"Хаах"</string> <string name="aerr_mute" msgid="1974781923723235953">"Төхөөрөмжийг дахин эхлүүлэх хүртэл дууг нь хаах"</string> @@ -1068,8 +1099,8 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Зөвшөөрөх"</string> <string name="sms_control_no" msgid="625438561395534982">"Татгалзах"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> нь <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b> уруу мессеж илгээх гэж байна."</string> - <string name="sms_short_code_details" msgid="5873295990846059400">"Энэ таны мобайл акаунтад "<b>"төлбөр нэмэгдүүлж магадгүй"</b>"."</string> - <string name="sms_premium_short_code_details" msgid="7869234868023975"><b>"Энэ таны мобайл акаунтад төлбөр нэмэгдүүлж магадгүй."</b></string> + <string name="sms_short_code_details" msgid="5873295990846059400">"Энэ таны мобайл бүртгэлд "<b>"төлбөр нэмэгдүүлж магадгүй"</b>"."</string> + <string name="sms_premium_short_code_details" msgid="7869234868023975"><b>"Энэ таны мобайл бүртгэлд төлбөр нэмэгдүүлж магадгүй."</b></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Илгээх"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Цуцлах"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Миний сонголтыг санах"</string> @@ -1173,13 +1204,13 @@ <string name="ime_action_default" msgid="2840921885558045721">"Ажиллуулах"</string> <string name="dial_number_using" msgid="5789176425167573586">"<xliff:g id="NUMBER">%s</xliff:g> ашиглан \n залгах"</string> <string name="create_contact_using" msgid="4947405226788104538">"<xliff:g id="NUMBER">%s</xliff:g> дугаар ашиглан \n харилцагч үүсгэх"</string> - <string name="grant_credentials_permission_message_header" msgid="2106103817937859662">"Дараах нэг буюу түүнээс дээш апп таны акаунтад одоо болон дараа хандах зөвшөөрлийг хүсэж байна."</string> + <string name="grant_credentials_permission_message_header" msgid="2106103817937859662">"Дараах нэг буюу түүнээс дээш апп таны бүртгэлд одоо болон дараа хандах зөвшөөрлийг хүсэж байна."</string> <string name="grant_credentials_permission_message_footer" msgid="3125211343379376561">"Та энэ хүсэлтийг зөвшөөрөх үү?"</string> <string name="grant_permissions_header_text" msgid="6874497408201826708">"Хандах хүсэлт"</string> <string name="allow" msgid="7225948811296386551">"Зөвшөөрөх"</string> <string name="deny" msgid="2081879885755434506">"Татгалзах"</string> <string name="permission_request_notification_title" msgid="6486759795926237907">"Зөвшөөрөл хүсэв"</string> - <string name="permission_request_notification_with_subtitle" msgid="8530393139639560189">"<xliff:g id="ACCOUNT">%s</xliff:g> акаунт зөвшөөрөл \n хүссэн"</string> + <string name="permission_request_notification_with_subtitle" msgid="8530393139639560189">"<xliff:g id="ACCOUNT">%s</xliff:g> бүртгэл зөвшөөрөл \n хүссэн"</string> <string name="forward_intent_to_owner" msgid="1207197447013960896">"Та энэ апп-г өөрийн ажлын профайлаас гадуур ашиглаж байна"</string> <string name="forward_intent_to_work" msgid="621480743856004612">"Та энэ апп-г өөрийн ажлын профайл дотор ашиглаж байна"</string> <string name="input_method_binding_label" msgid="1283557179944992649">"Оруулах арга"</string> @@ -1234,8 +1265,8 @@ <string name="sync_really_delete" msgid="2572600103122596243">"Устгах"</string> <string name="sync_undo_deletes" msgid="2941317360600338602">"Устгасныг буцаах"</string> <string name="sync_do_nothing" msgid="3743764740430821845">"Одоо юу ч хийхгүй"</string> - <string name="choose_account_label" msgid="5655203089746423927">"Акаунт сонгох"</string> - <string name="add_account_label" msgid="2935267344849993553">"Акаунт нэмэх"</string> + <string name="choose_account_label" msgid="5655203089746423927">"Бүртгэл сонгох"</string> + <string name="add_account_label" msgid="2935267344849993553">"Бүртгэл нэмэх"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Аккаунт нэмэх"</string> <string name="number_picker_increment_button" msgid="2412072272832284313">"Өсөх"</string> <string name="number_picker_decrement_button" msgid="476050778386779067">"Бууруулах"</string> @@ -1369,7 +1400,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Нэвтрэх"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Хэрэглэгчийн нэр эсвэл нууц үг буруу."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Хэрэглэгчийн нэр нууц үгээ мартсан уу?\n"<b>"google.com/accounts/recovery"</b>"-д зочилно уу."</string> - <string name="kg_login_checking_password" msgid="1052685197710252395">"Акаунт шалгаж байна…"</string> + <string name="kg_login_checking_password" msgid="1052685197710252395">"Бүртгэл шалгаж байна…"</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Та PIN кодоо <xliff:g id="NUMBER_0">%1$d</xliff:g> удаа буруу бичив. \n\n<xliff:g id="NUMBER_1">%2$d</xliff:g> секундын дараа дахин оролдоно уу."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Та PIN кодоо <xliff:g id="NUMBER_0">%1$d</xliff:g> удаа буруу бичив. \n\n<xliff:g id="NUMBER_1">%2$d</xliff:g> секундын дараа дахин оролдоно уу."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Та тайлах хээг <xliff:g id="NUMBER_0">%1$d</xliff:g> удаа буруу зурлаа. \n\n<xliff:g id="NUMBER_1">%2$d</xliff:g> секундын дараа дахин оролдоно уу."</string> @@ -1379,7 +1410,7 @@ <string name="kg_failed_attempts_now_wiping" product="tablet" msgid="2072996269148483637">"Та таблетыг тайлах гэж <xliff:g id="NUMBER">%d</xliff:g> удаа буруу оролдлоо. Таблет одоо үйлдвэрийн үндсэн утгаараа тохируулагдах болно."</string> <string name="kg_failed_attempts_now_wiping" product="tv" msgid="4987878286750741463">"Та телевизийнхээ түгжээг <xliff:g id="NUMBER">%d</xliff:g> удаа буруу оруулсан байна. Телевиз үйлдвэрээс гарсан анхны тохиргоонд шилжих болно."</string> <string name="kg_failed_attempts_now_wiping" product="default" msgid="4817627474419471518">"Та утсыг тайлах гэж <xliff:g id="NUMBER">%d</xliff:g> удаа буруу оролдлоо. Утас одоо үйлдвэрийн үндсэн утгаараа тохируулагдах болно."</string> - <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Та тайлах хээг <xliff:g id="NUMBER_0">%1$d</xliff:g> удаа буруу зурлаа. <xliff:g id="NUMBER_1">%2$d</xliff:g> удаа дахин буруу оруулбал, та таблетаа тайлахын тулд имэйл акаунт шаардлагатай болно.\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> секундын дараа дахин оролдоно уу."</string> + <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Та тайлах хээг <xliff:g id="NUMBER_0">%1$d</xliff:g> удаа буруу зурлаа. <xliff:g id="NUMBER_1">%2$d</xliff:g> удаа дахин буруу оруулбал, та таблетаа тайлахын тулд имэйл бүртгэл шаардлагатай болно.\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> секундын дараа дахин оролдоно уу."</string> <string name="kg_failed_attempts_almost_at_login" product="tv" msgid="4224651132862313471">"Та зурган түгжээг <xliff:g id="NUMBER_0">%1$d</xliff:g> удаа буруу оруулсан байна. <xliff:g id="NUMBER_1">%2$d</xliff:g> удаа буруу оруулсны дараагаар та телевизийнхээ түгжээг и-мэйл дансаа ашиглан тайлах хэрэгтэй болно.\n\n Та <xliff:g id="NUMBER_2">%3$d</xliff:g> секундийн дараа дахин оролдоно уу."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Та тайлах хээг <xliff:g id="NUMBER_0">%1$d</xliff:g> удаа буруу зурлаа. <xliff:g id="NUMBER_1">%2$d</xliff:g> удаа дахин буруу оруулбал, та утсаа тайлахын тулд имэйл акаунтаа ашиглах шаардлагатай болно.\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> секундын дараа дахин оролдоно уу."</string> <string name="kg_text_message_separator" product="default" msgid="4160700433287233771">" — "</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> устсан"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"Ажлын <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Энэ дэлгэцийг эхэнд нээхийг болиулахын тулд Буцах товчлуурыг дараад, хүлээнэ үү."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Энэ дэлгэцийг эхэнд нээхийг болиулахын тулд Тоймыг дараад, хүлээнэ үү."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"App-ыг тусгайлан тэмдэглэсэн байна: Энэ төхөөрөмж дээр тусгайлан тэмдэглэсэн сонголтыг устгах боломжгүй."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Дэлгэцийг тогтоосон"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Дэлгэцийг сулласан"</string> @@ -1577,6 +1607,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS хүсэлтийг USSD хүсэлт болгон өөрчилсөн байна."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS хүсэлтийг шинэ SS хүсэлт болгон өөрчилсөн байна."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Ажлын профайл"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Дэлгэх товчлуур"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"унтраах/асаах өргөтгөл"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Андройд USB Peripheral Port"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB Peripheral Port"</string> @@ -1584,6 +1616,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Илүү цонхнуудыг хаах"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Томруулах"</string> <string name="close_button_text" msgid="3937902162644062866">"Хаах"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> сонгосон</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> сонгосон</item> @@ -1616,4 +1650,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Энэ төхөөрөмжийг хязгаарлалтгүй ашиглахын тулд үйлдвэрийн тохиргоонд дахин тохируулна уу"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Дэлгэрэнгүй үзэх бол дарна уу."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g>-г цуцалсан"</string> </resources> diff --git a/core/res/res/values-mr-rIN/strings.xml b/core/res/res/values-mr-rIN/strings.xml index d3d5478b8da2..ee6b13d6a446 100644 --- a/core/res/res/values-mr-rIN/strings.xml +++ b/core/res/res/values-mr-rIN/strings.xml @@ -891,6 +891,38 @@ <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g>वर्षामध्ये</item> <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>वर्षांमध्ये</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> मिनिटापूर्वी</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> मिनिटांंपूर्वी</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> तासापूर्वी</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> तासांंपूर्वी</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> दिवसापूर्वी</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> दिवसांंपूर्वी</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> वर्षापूर्वी</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> वर्षांपूर्वी</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> मिनिटात</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> मिनिटांमध्ये</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> तासामध्ये</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> तासांंमध्ये</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> दिवसात</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> दिवसांंमध्ये</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> वर्षात</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> वर्षांंमध्ये</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"व्हिडिओ समस्या"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"या डिव्हाइसवर प्रवाहित करण्यासाठी हा व्हिडिओ वैध नाही."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"हा व्हिडिओ प्ले करू शकत नाही."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> थांबली आहे"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> थांबतो"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> थांबते"</string> - <string name="aerr_restart" msgid="9001379185665886595">"अॅप रीस्टार्ट करा"</string> - <string name="aerr_reset" msgid="7645427603514220451">"अॅप रीसेट आणि रीस्टार्ट करा"</string> + <string name="aerr_restart" msgid="7581308074153624475">"अॅप पुन्हा उघडा"</string> <string name="aerr_report" msgid="5371800241488400617">"अभिप्राय पाठवा"</string> <string name="aerr_close" msgid="2991640326563991340">"बंद करा"</string> <string name="aerr_mute" msgid="1974781923723235953">"डिव्हाइस रीस्टार्ट होईपर्यंत नि:शब्द करा"</string> @@ -1515,7 +1546,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> हटविली"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"कार्य <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"ही स्क्रीन अनपिन करण्यासाठी, परत ला स्पर्श करा आणि धरून ठेवा."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"ही स्क्रीन अनपिन करण्यासाठी, विहंगावलोकनास स्पर्श करा आणि धरून ठेवा."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"अॅप पिन केलेला आहे: या डिव्हाइसवर अनपिन करण्यास अनुमती नाही."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"स्क्रीन पिन केली"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"स्क्रीन अनपिन केली"</string> @@ -1582,6 +1612,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS विनंती USSD विनंतीवर सुधारित केली आहे."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS विनंती नवीन SS विनंतीवर सुधारित केली आहे."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"कार्य प्रोफाईल"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"विस्तृत करा बटण"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"टॉगल विस्तार"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB परिधीय पोर्ट"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB परिधीय पोर्ट"</string> @@ -1589,6 +1621,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"ओव्हरफ्लो बंद करा"</string> <string name="maximize_button_text" msgid="7543285286182446254">"मोठे करा"</string> <string name="close_button_text" msgid="3937902162644062866">"बंद करा"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> निवडला</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> निवडले</item> @@ -1621,4 +1655,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"हे डिव्हाइस निर्बंधांशिवाय वापरण्यासाठी फॅक्टरी रीसेट करा"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"अधिक जाणून घेण्यासाठी स्पर्श करा."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> अक्षम केले"</string> </resources> diff --git a/core/res/res/values-ms-rMY/strings.xml b/core/res/res/values-ms-rMY/strings.xml index b49fca9ef333..2486b94d925a 100644 --- a/core/res/res/values-ms-rMY/strings.xml +++ b/core/res/res/values-ms-rMY/strings.xml @@ -891,6 +891,38 @@ <item quantity="other">dalam <xliff:g id="COUNT_1">%d</xliff:g>t</item> <item quantity="one">dalam <xliff:g id="COUNT_0">%d</xliff:g>t</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minit yang lalu</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minit yang lalu</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> jam yang lalu</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> jam yang lalu</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> hari yang lalu</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> hari yang lalu</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tahun yang lalu</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> tahun yang lalu</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other">dalam <xliff:g id="COUNT_1">%d</xliff:g> minit</item> + <item quantity="one">dalam <xliff:g id="COUNT_0">%d</xliff:g> minit</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other">dalam <xliff:g id="COUNT_1">%d</xliff:g> jam</item> + <item quantity="one">dalam <xliff:g id="COUNT_0">%d</xliff:g> jam</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other">dalam <xliff:g id="COUNT_1">%d</xliff:g> hari</item> + <item quantity="one">dalam <xliff:g id="COUNT_0">%d</xliff:g> hari</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other">dalam <xliff:g id="COUNT_1">%d</xliff:g> tahun</item> + <item quantity="one">dalam <xliff:g id="COUNT_0">%d</xliff:g> tahun</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Masalah video"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Maaf, video ini tidak sah untuk penstriman ke peranti ini."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Tidak dapat mainkan video ini."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> telah berhenti"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> asyik berhenti"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> asyik berhenti"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Mulakan semula apl"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Tetapkan semula dan mulakan semula apl"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Buka apl sekali lagi"</string> <string name="aerr_report" msgid="5371800241488400617">"Hantar maklum balas"</string> <string name="aerr_close" msgid="2991640326563991340">"Tutup"</string> <string name="aerr_mute" msgid="1974781923723235953">"Redam sehingga peranti dimulakan semula"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> dipadamkan"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"Kerja <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Untuk menyahsematkan skrin ni, ketik & tahan Kembali."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Untuk menyahsematkan skrin ini, ketik & tahan Ikhtisar."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Apl disemat: Nyahsemat tidak dibenarkan pada peranti ini."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Skrin disemat"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Skrin dinyahsemat"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Permintaan SS diubah kepada permintaan USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Permintaan SS diubah kepada permintaan SS baharu."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Profil kerja"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Butang kembangkan"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"togol pengembangan"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Port Persisian USB Android"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"Port Persisian USB"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Tutup limpahan"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Maksimumkan"</string> <string name="close_button_text" msgid="3937902162644062866">"Tutup"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> dipilih</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> dipilih</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Lakukan tetapan semula kilang untuk menggunakan peranti ini tanpa sekatan"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Ketik untuk mengetahui lebih lanjut."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> dilumpuhkan"</string> </resources> diff --git a/core/res/res/values-my-rMM/strings.xml b/core/res/res/values-my-rMM/strings.xml index dea7dbe1d6e8..fcc09fc51718 100644 --- a/core/res/res/values-my-rMM/strings.xml +++ b/core/res/res/values-my-rMM/strings.xml @@ -81,7 +81,7 @@ <string name="ThreeWCMmi" msgid="9051047170321190368">"(၃)ယောက်ဆိုင်ပြောဆိုခြင်း"</string> <string name="RuacMmi" msgid="7827887459138308886">"စိတ်အနှောက်အယှက်ဖြစ်သော မလိုလားသည့်ခေါ်ဆိုမှုများအား ငြင်းဖယ်ခြင်း"</string> <string name="CndMmi" msgid="3116446237081575808">"ခေါ်ဆိုသောနံပါတ် ပေးပို့မှု"</string> - <string name="DndMmi" msgid="1265478932418334331">"မနှောက်ယှက်ပါနှင့်"</string> + <string name="DndMmi" msgid="1265478932418334331">"မနှောင့်ယှက်ရ"</string> <string name="CLIRDefaultOnNextCallOn" msgid="429415409145781923">"ပုံသေအားဖြင့် ခေါ်ဆိုသူအိုင်ဒီ(Caller ID)အား ကန့်သတ်ထားသည်။ နောက်ထပ်အဝင်ခေါ်ဆိုမှု-ကန့်သတ်ထားသည်။"</string> <string name="CLIRDefaultOnNextCallOff" msgid="3092918006077864624">"ပုံသေအားဖြင့် ခေါ်ဆိုသူအိုင်ဒီ(Caller ID)အား ကန့်သတ်ထားသည်။ နောက်ထပ်အဝင်ခေါ်ဆိုမှု-ကန့်သတ်မထားပါ။"</string> <string name="CLIRDefaultOffNextCallOn" msgid="6179425182856418465">"ပုံသေအားဖြင့် ခေါ်ဆိုသူအိုင်ဒီ(Caller ID)အား ကန့်သတ်မထားပါ။ နောက်ထပ်အဝင်ခေါ်ဆိုမှု-ကန့်သတ်ထားသည်။"</string> @@ -414,7 +414,7 @@ <string name="permdesc_changeWifiMulticastState" product="tablet" msgid="7969774021256336548">"အပလီကေးရှင်းအား ဝိုင်ဖိုင်ကွန်ရက်ပေါ်တွင် သင့်တက်ဘလက်တစ်ခုထဲအားမဟုတ်ပဲ multicast လိပ်စာအား သုံးပြီး လွှင့်ထုတ်သော အချက်အလက်များ လက်ခံခွင့် ပြုပါ။ ဒီလိုသုံးခြင်းမှာ non-multicast ထက် ဘက်ထရီ ပိုကုန်ပါသည်။"</string> <string name="permdesc_changeWifiMulticastState" product="tv" msgid="9031975661145014160">"သင့် တီဗွီနှင့်သာ မဟုတ်ဘဲ၊ ကွန်ယက်လိပ်စာများစွာ သုံးသော ဝိုင်ဖိုင်ကွန်ယက်ရှိ စက်ကိရိယာအားလုံးသို့ ပို့သော ပက်ကက်များအား လက်ခံရရှိရန် အက်ပ် အားခွင့်ပြုပါ။ ၎င်းသည် ကွန်ယက်လိပ်စာများစွာမသုံးသောမုဒ်ထက် စွမ်းအားပိုသုံး၏။"</string> <string name="permdesc_changeWifiMulticastState" product="default" msgid="6851949706025349926">"အပလီကေးရှင်းအား ဝိုင်ဖိုင်နက်ဘ်ပေါ်တွင် သင့်ဖုန်းတစ်ခုထဲအားမဟုတ်ပဲ multicast လိပ်စာအား သုံးပြီး လွှင့်ထုတ်သော အချက်အလက်များ လက်ခံခွင့် ပြုပါ။ ဒီလိုသုံးခြင်းမှာ non-multicast ထက် ဘက်ထရီ ပိုကုန်ပါသည်။"</string> - <string name="permlab_bluetoothAdmin" msgid="6006967373935926659">"ဘလူးတု ဆက်တင်များအား သုံးခွင့်ပေးရန်"</string> + <string name="permlab_bluetoothAdmin" msgid="6006967373935926659">"ဘလူးတုသ် ဆက်တင်များအား သုံးခွင့်ပေးရန်"</string> <string name="permdesc_bluetoothAdmin" product="tablet" msgid="6921177471748882137">"အက်ပ်အား ဒေသန္တရ ဘလူးတုသ် တက်ဘလက်ကို စီစဉ်ဖွဲ့စည်းခွင့်ကို၎င်း၊ အဝေးထိန်း ကိရိယာများကို ရှာကြံလျက် ချိတ်တွဲခွင့်ကို၎င်း ပေးထားသည်။"</string> <string name="permdesc_bluetoothAdmin" product="tv" msgid="3373125682645601429">"ကွန်ယက်တွင်းရှိ ဘလူးတုသ် တီဗွီအား ပုံစံပြင်ရန်နှင့်၊ အဝေးရှိ စက်ကိရိယာများအား ရှာဖွေတွဲဖက်ရန် အက်ပ် အား ခွင့်ပြုပါ။"</string> <string name="permdesc_bluetoothAdmin" product="default" msgid="8931682159331542137">"အက်ပ်အား ဒေသန္တရ ဘလူးတုသ် ဖုန်းကို စီစဉ်ဖွဲ့စည်းခွင့်ကို၎င်း၊ အဝေးထိန်း ကိရိယာများကို ရှာကြံလျက် ချိတ်တွဲခွင့်ကို၎င်း ပေးထားသည်။"</string> @@ -424,7 +424,7 @@ <string name="permdesc_changeWimaxState" product="tablet" msgid="3156456504084201805">"အပလီကေးရှင်းအား တက်ဘလက်ကို ဝိုင်မက်စ် ကွန်ရက်များနဲ့ ဆက်သွယ်ခြင်း၊ ဆက်သွယ်မှု ရပ်ဆိုင်းခြင်းများ လုပ်ခွင့်ပြုပါ"</string> <string name="permdesc_changeWimaxState" product="tv" msgid="6022307083934827718">"တီဗွီနှင့် ချိတ်ဆက်ရန် အက်ပ် အား ခွင့်ပြုပြီး တီဗွီနှင့် WiMAX ကွန်ယက်များ ချိတ်ဆက်ထားမှုအား ဖြတ်တောက်ပါ။"</string> <string name="permdesc_changeWimaxState" product="default" msgid="697025043004923798">"အပလီကေးရှင်းအား ဖုန်းကို ဝိုင်မက်စ် ကွန်ရက်များနဲ့ ဆက်သွယ်ခြင်း၊ ဆက်သွယ်မှု ရပ်ဆိုင်းခြင်းများ လုပ်ခွင့်ပြုပါ"</string> - <string name="permlab_bluetooth" msgid="6127769336339276828">"ဘလူးတု စက်များနှင့် အတူတွဲချိတ်ရန်"</string> + <string name="permlab_bluetooth" msgid="6127769336339276828">"ဘလူးတုသ် စက်များနှင့် အတူတွဲချိတ်ရန်"</string> <string name="permdesc_bluetooth" product="tablet" msgid="3480722181852438628">"အပလီကေးရှင်းအား တက်ဘလက်ပေါ်မှ ဘလူးတုသ် အပြင်အဆင်အား ကြည့်ခွင့်၊ တခြားစက်များနဲ့ ဆက်သွယ်ခြင်း၊ ဆက်သွယ်ခြင်းကို လက်ခံခွင့်ပြုပါ။"</string> <string name="permdesc_bluetooth" product="tv" msgid="3974124940101104206">"တီဗွီတွင် ဘလူးတုသ်အတွက် ပုံစံပြင်ခြင်းများ ဝင်ကြည့်ရန်နှင့်၊ တွဲဖက်ထားသည့် စက်ကိရိယာများအား ချိတ်ဆက်မှုပြုရန်နှင့်လက်ခံရန် အက်ပ် အား ခွင့်ပြုပါ။"</string> <string name="permdesc_bluetooth" product="default" msgid="3207106324452312739">"အပလီကေးရှင်းအား ဖုန်းမှဘလူးတု အပြင်အဆင်အား ကြည့်ခွင့်၊ တခြားစက်များနဲ့ ဆက်သွယ်ခြင်း၊ ဆက်သွယ်ခြင်းကို လက်ခံခွင့်ပြုပါ။"</string> @@ -522,9 +522,9 @@ <string name="policydesc_watchLogin_secondaryUser" product="tablet" msgid="4280246270601044505">"ဖန်မျက်နှာပြင်အား သော့ဖွင့်စဉ် လျှို့ဝှက်ကုဒ်အမှားများ ရိုက်သွင်းမှုအား စောင့်ကြည့်ရန်နှင့်၊ လျှို့ဝှက်ကုဒ်အမှားများ များစွာ ရိုက်သွင်းပါက တက်ဘလက်အား သော့ချခြင်း သို့မဟုတ် တက်ဘလက်၏ အချက်အလက်များအား ဖျက်ပစ်ခြင်းများ ပြုလုပ်မည်။"</string> <string name="policydesc_watchLogin_secondaryUser" product="TV" msgid="3484832653564483250">"ဖန်မျက်နှာပြင်အား သော့ဖွင့်စဉ် လျှို့ဝှက်ကုဒ်အမှားများ ရိုက်သွင်းမှုအား စောင့်ကြည့်ရန်နှင့်၊ လျှို့ဝှက်ကုဒ်အမှားများ များစွာ ရိုက်သွင်းပါက တီဗွီအား သော့ချခြင်း သို့မဟုတ် တီဗွီ၏ အချက်အလက်များအား ဖျက်ပစ်ခြင်းများ ပြုလုပ်မည်။"</string> <string name="policydesc_watchLogin_secondaryUser" product="default" msgid="2185480427217127147">"ဖန်မျက်နှာပြင်အား သော့ဖွင့်စဉ် လျှို့ဝှက်ကုဒ်အမှားများ ရိုက်သွင်းမှုအား စောင့်ကြည့်ရန်နှင့်၊ လျှို့ဝှက်ကုဒ်အမှားများ များစွာ ရိုက်သွင်းပါက ဖုန်းအား သော့ချခြင်း သို့မဟုတ် ဖုန်း၏ အချက်အလက်များအား ဖျက်ပစ်ခြင်းများ ပြုလုပ်မည်။"</string> - <string name="policylab_resetPassword" msgid="4934707632423915395">"မျက်နှာပြင်သော့ခတ်ခြင်းအား ပြောင်းမည်"</string> - <string name="policydesc_resetPassword" msgid="1278323891710619128">"မျက်နှာပြင်သော့ခတ်ခြင်းအား ပြောင်းမည်။"</string> - <string name="policylab_forceLock" msgid="2274085384704248431">"မျက်နှာပြင်အားသော့ချရန်"</string> + <string name="policylab_resetPassword" msgid="4934707632423915395">"မျက်နှာပြင်လော့ခ်ပြောင်းခြင်း"</string> + <string name="policydesc_resetPassword" msgid="1278323891710619128">"မျက်နှာပြင်လော့ခ်ပြောင်းခြင်း"</string> + <string name="policylab_forceLock" msgid="2274085384704248431">"မျက်နှာပြင်အား လော့ခ်ချခြင်း"</string> <string name="policydesc_forceLock" msgid="1141797588403827138">"မည်သည့်အချိန်တွင် ဖန်သားပြင်အား မည်ကဲ့သို့နည်းဖြင် သော့ချရန် ထိန်းချုပ်ခြင်း"</string> <string name="policylab_wipeData" msgid="3910545446758639713">"ဒေတာအားလုံးအားဖျက်ခြင်း"</string> <string name="policydesc_wipeData" product="tablet" msgid="4306184096067756876">"စက်ရုံထုတ် အခြေအနေအား ပြန်ပြောင်းခြင်းဖြင့် တက်ဘလက်ရှိ အချက်အလက်များအား ကြိုတင်သတိပေးမှုမရှိပဲ ဖျက်စီးရန်"</string> @@ -580,8 +580,8 @@ <string-array name="imProtocols"> <item msgid="8595261363518459565">"AIM"</item> <item msgid="7390473628275490700">"Windows Live"</item> - <item msgid="7882877134931458217">"ရာဟူး"</item> - <item msgid="5035376313200585242">"စကိုက်ပ်"</item> + <item msgid="7882877134931458217">"Yahoo"</item> + <item msgid="5035376313200585242">"Skype"</item> <item msgid="7532363178459444943">"QQ"</item> <item msgid="3713441034299660749">"ဂူဂဲလ်တော့ခ်"</item> <item msgid="2506857312718630823">"ICQ"</item> @@ -628,10 +628,10 @@ <string name="imProtocolCustom" msgid="6919453836618749992">"မိမိစိတ်ကြိုက်"</string> <string name="imProtocolAim" msgid="7050360612368383417">"AIM"</string> <string name="imProtocolMsn" msgid="144556545420769442">"Windows Live"</string> - <string name="imProtocolYahoo" msgid="8271439408469021273">"ရာဟူး"</string> - <string name="imProtocolSkype" msgid="9019296744622832951">"စကိုက်ပ်"</string> + <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string> + <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string> <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string> - <string name="imProtocolGoogleTalk" msgid="493902321140277304">"ဟန်းအောက့်"</string> + <string name="imProtocolGoogleTalk" msgid="493902321140277304">"Hangouts"</string> <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string> <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string> <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string> @@ -716,7 +716,7 @@ <string name="lockscreen_forgot_pattern_button_text" msgid="2626999449610695930">"ပုံစံအားမေ့နေပါသလား"</string> <string name="lockscreen_glogin_forgot_pattern" msgid="2588521501166032747">"အကောင့်ဖွင့်ရန်"</string> <string name="lockscreen_glogin_too_many_attempts" msgid="2751368605287288808">"အကြိမ်ရေ များစွာ ပုံဆွဲသော့ဖွင့်ရန် ကြိုးစားခြင်း"</string> - <string name="lockscreen_glogin_instructions" msgid="3931816256100707784">"သော့ဖွင့်ရန် ဂူဂဲလ် အကောင့်ဖြင့် ဝင်ပါ"</string> + <string name="lockscreen_glogin_instructions" msgid="3931816256100707784">"သော့ဖွင့်ရန် Google အကောင့်ဖြင့် ဝင်ပါ"</string> <string name="lockscreen_glogin_username_hint" msgid="8846881424106484447">"သုံးစွဲသူ အမှတ် (အီးမေးလ်)"</string> <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"လျို့ဝှက် နံပါတ်"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"ဝင်ရန်"</string> @@ -742,7 +742,7 @@ <string name="keyguard_accessibility_status" msgid="8008264603935930611">"အခြေအနေ"</string> <string name="keyguard_accessibility_camera" msgid="8904231194181114603">"ကင်မရာ"</string> <string name="keygaurd_accessibility_media_controls" msgid="262209654292161806">"မီဒီယာ ထိန်းချုပ်မှုများ"</string> - <string name="keyguard_accessibility_widget_reorder_start" msgid="8736853615588828197">"ဝဒ်ဂျက်များ နေရာစီခြင်း စတင်ပါပြီ"</string> + <string name="keyguard_accessibility_widget_reorder_start" msgid="8736853615588828197">"ဝိဂျက်များ နေရာစီခြင်း စတင်ပါပြီ"</string> <string name="keyguard_accessibility_widget_reorder_end" msgid="7170190950870468320">"ဝဒ်ဂျက်များကို နေရာ ပြန်စီပြီးပါပြီ"</string> <string name="keyguard_accessibility_widget_deleted" msgid="4426204263929224434">"<xliff:g id="WIDGET_INDEX">%1$s</xliff:g> ဝဒ်ဂျက်ကို ဖျက်လိုက်ပြီးပါပြီ"</string> <string name="keyguard_accessibility_expand_lock_area" msgid="519859720934178024">"သော့မချထားသာ နယ်ပယ်ကို ချဲ့ပါ"</string> @@ -803,9 +803,9 @@ <string name="permlab_writeGeolocationPermissions" msgid="5962224158955273932">"ဘရောင်ဇာ ဘူမိဇုန်သတ်မှတ်မှု ခွင့်ပြုချက်များကို မွမ်းမံခြင်း"</string> <string name="permdesc_writeGeolocationPermissions" msgid="1083743234522638747">"အက်ပ်အား ဘရောင်ဇာ၏ ဘူမိဇုန်သတ်မှတ်ရေး ခွင့်ပြုချက်များကို မွမ်းမံခွင့် ပြုသည်။ ကြံဖန် အက်ပ်များက ၎င်းကို အသုံးချပြီး လိုရာ ဝက်ဘ်ဆိုက်များသို့ တည်နေရာ အချက်အလက် ပို့မှုကို လုပ်နိုင်သည်။"</string> <string name="save_password_message" msgid="767344687139195790">"ဤလျှို့ဝှက်စကားဝှက်အား ဘရောင်ဇာကိုမှတ်ခိုင်းမည်လား"</string> - <string name="save_password_notnow" msgid="6389675316706699758">"ယခုမဟုတ်ပါ"</string> + <string name="save_password_notnow" msgid="6389675316706699758">"ယခုမလုပ်ပါ"</string> <string name="save_password_remember" msgid="6491879678996749466">"မှတ်ထားရန်"</string> - <string name="save_password_never" msgid="8274330296785855105">"မည်သည့်အခါမှ"</string> + <string name="save_password_never" msgid="8274330296785855105">"ကန့်သတ်မှုမရှိ"</string> <string name="open_permission_deny" msgid="7374036708316629800">"သင့်ဆီမှာ ဒီစာမျက်နှာကို ဖွင့်ရန် ခွင့်ပြုချက် မရှိပါ။"</string> <string name="text_copied" msgid="4985729524670131385">"clipboardထံ စာသားအားကူးယူမည်"</string> <string name="more_item_label" msgid="4650918923083320495">"နောက်ထပ်"</string> @@ -817,7 +817,7 @@ <string name="search_hint" msgid="1733947260773056054">"ရှာဖွေပါ..."</string> <string name="searchview_description_search" msgid="6749826639098512120">"ရှာဖွေခြင်း"</string> <string name="searchview_description_query" msgid="5911778593125355124">"ရှာစရာ အချက်အလက်နေရာ"</string> - <string name="searchview_description_clear" msgid="1330281990951833033">"ရှာစရာ အချက်အလက်များ ရှင်းလင်းရန်"</string> + <string name="searchview_description_clear" msgid="1330281990951833033">"ရှာစရာ အချက်အလက်များ ဖယ်ရှားရန်"</string> <string name="searchview_description_submit" msgid="2688450133297983542">"ရှာဖွေစရာ အချက်အလက်ကို အတည်ပြုရန်"</string> <string name="searchview_description_voice" msgid="2453203695674994440">"အသံဖြင့် ရှာဖွေခြင်း"</string> <string name="enable_explore_by_touch_warning_title" msgid="7460694070309730149">"ထိတွေ့ပြီး ရှာဖွေခြင်း ဖွင့်မည်မလား?"</string> @@ -891,6 +891,38 @@ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>နှစ်အတွင်း</item> <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>နှစ်အတွင်း</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other">ပြီးခဲ့သည့် <xliff:g id="COUNT_1">%d</xliff:g> မိနစ်က</item> + <item quantity="one">ပြီးခဲ့သည့် <xliff:g id="COUNT_0">%d</xliff:g> မိနစ်က</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other">ပြီးခဲ့သည့် <xliff:g id="COUNT_1">%d</xliff:g> နာရီက</item> + <item quantity="one">ပြီးခဲ့သည့် <xliff:g id="COUNT_0">%d</xliff:g> နာရီက</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other">ပြီးခဲ့သည့် <xliff:g id="COUNT_1">%d</xliff:g> ရက်က</item> + <item quantity="one">ပြီးခဲ့သည့် <xliff:g id="COUNT_0">%d</xliff:g> ရက်က</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other">ပြီးခဲ့သည့် <xliff:g id="COUNT_1">%d</xliff:g> နှစ်က</item> + <item quantity="one">ပြီးခဲ့သည့် <xliff:g id="COUNT_0">%d</xliff:g> နှစ်က</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> မိနစ်အတွင်း</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> မိနစ်အတွင်း</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> နာရီအတွင်း</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> နာရီအတွင်း</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ရက်အတွင်း</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ရက်အတွင်း</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> နှစ်အတွင်း</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> နှစ်အတွင်း</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"ဗီဒီယို ပြဿနာ"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"ဒီဗိဒီယိုမှာ ဒီကိရိယာ ပေါ်မှာ ဖွင့်ကြည့်၍ မရနိုင်ပါ။"</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"ဒီဗီဒီယိုကို ပြသလို့ မရပါ"</string> @@ -924,9 +956,9 @@ <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> က အလုပ်လုပ်နေသည်။"</string> <string name="app_running_notification_text" msgid="1197581823314971177">"နောက်ထပ်အချက်အလက်များကို ကြည့်ရန် သို့မဟုတ် အက်ပ်ကိုရပ်တန့်ရန် တို့ပါ။"</string> <string name="ok" msgid="5970060430562524910">"အိုကေ"</string> - <string name="cancel" msgid="6442560571259935130">"ဖျက်သိမ်းရန်"</string> + <string name="cancel" msgid="6442560571259935130">"မလုပ်တော့ပါ"</string> <string name="yes" msgid="5362982303337969312">"အိုကေ"</string> - <string name="no" msgid="5141531044935541497">"ဖျက်သိမ်းရန်"</string> + <string name="no" msgid="5141531044935541497">"မလုပ်တော့ပါ"</string> <string name="dialog_alert_title" msgid="2049658708609043103">"သတိပြုရန်"</string> <string name="loading" msgid="7933681260296021180">"တင်နေ…"</string> <string name="capital_on" msgid="1544682755514494298">"ဖွင့်ရန်"</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> ရပ်တန့်သွားပါပြီ"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> သည်ထပ်တလဲလဲ ရပ်တန့်နေပါသည်"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> သည်ထပ်တလဲလဲ ရပ်တန့်နေပါသည်"</string> - <string name="aerr_restart" msgid="9001379185665886595">"အက်ပ်ကိုပြန်လည်စတင်ပါ"</string> - <string name="aerr_reset" msgid="7645427603514220451">"အက်ပ်ကို ပြန်လည်ပြင်ဆင်သတ်မှတ်ပြီး ပြန်လည်စတင်ပါ"</string> + <string name="aerr_restart" msgid="7581308074153624475">"အက်ပ်ကိုပြန်ဖွင့်ပါ"</string> <string name="aerr_report" msgid="5371800241488400617">"တုံ့ပြန်ချက်ပို့ပါ"</string> <string name="aerr_close" msgid="2991640326563991340">"ပိတ်ပါ"</string> <string name="aerr_mute" msgid="1974781923723235953">"စက်ပစ္စည်း ပြန်လည်စတင်သည့်တိုင် အသံတိတ်ပါ"</string> @@ -1022,8 +1053,8 @@ <string name="volume_icon_description_incall" msgid="8890073218154543397">"ခေါ်ဆိုနေခြင်းအသံအတိုးအကျယ်"</string> <string name="volume_icon_description_media" msgid="4217311719665194215">"မီဒီယာအသံအတိုးအကျယ်"</string> <string name="volume_icon_description_notification" msgid="7044986546477282274">"အကြောင်းကြားသံအတိုးအကျယ်"</string> - <string name="ringtone_default" msgid="3789758980357696936">"မူလအသံမြည်သံ"</string> - <string name="ringtone_default_with_actual" msgid="8129563480895990372">"မူလအသံမြည်သံ (<xliff:g id="ACTUAL_RINGTONE">%1$s</xliff:g>)"</string> + <string name="ringtone_default" msgid="3789758980357696936">"မူရင်းမြည်သံ"</string> + <string name="ringtone_default_with_actual" msgid="8129563480895990372">"မူရင်းမြည်သံ (<xliff:g id="ACTUAL_RINGTONE">%1$s</xliff:g>)"</string> <string name="ringtone_silent" msgid="7937634392408977062">"တစ်ခုမှမဟုတ်"</string> <string name="ringtone_picker_title" msgid="3515143939175119094">"မြည်သံများ"</string> <string name="ringtone_unknown" msgid="5477919988701784788">"မသိသောမြည်သံ"</string> @@ -1071,16 +1102,16 @@ <string name="sms_short_code_details" msgid="5873295990846059400"><b>"ဒါက သင့် မိုဘိုင်း အကောင့် အတွက် "</b>" ကုန်ကျမှု ရှိလာနိုင်သည်။"</string> <string name="sms_premium_short_code_details" msgid="7869234868023975"><b>"ဒါက သင့် မိုဘိုင်း အကောင့် အတွက် ကုန်ကျမှု ရှိလာနိုင်သည်။"</b></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"ပို့ရန်"</string> - <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"ဖျက်သိမ်းရန်"</string> + <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"မလုပ်တော့ပါ"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"ကျွန်ပ်၏ရွေးချယ်မှုကို မှတ်ထားရန်"</string> <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"နောင်တွင် ဆက်တင် > အပလီကေးရှင်းများ မှပြောင်းနိုင်သည်"</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"အမြဲခွင့်ပြုရန်"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"ဘယ်တော့မှခွင့်မပြုပါ"</string> <string name="sim_removed_title" msgid="6227712319223226185">"SIMကဒ်ဖယ်ရှားခြင်း"</string> - <string name="sim_removed_message" msgid="5450336489923274918">"သင်က မှန်ကန်သည့် ဆင်းမ် ကဒ် တစ်ခုနှင့် ပြန်မစမချင်း ဆယ်လူလာ ကွန်ရက်ကို ရှာတွေ့မည် မဟုတ်ပါ။"</string> + <string name="sim_removed_message" msgid="5450336489923274918">"သင်က မှန်ကန်သည့် ဆင်းမ် ကဒ် တစ်ခုနှင့် ပြန်မစမချင်း ဆဲလ်လူလာ ကွန်ရက်ကို ရှာတွေ့မည် မဟုတ်ပါ။"</string> <string name="sim_done_button" msgid="827949989369963775">"ပြီးပါပြီ"</string> <string name="sim_added_title" msgid="3719670512889674693">"ဆင်းမ်ကဒ် ထည့်ပါသည်"</string> - <string name="sim_added_message" msgid="7797975656153714319">"ဆယ်လူလာ ကွန်ရက်ကို ရယူသုံးရန် သင့် ကိရိယာကို ပြန်ဖွင့်ပေးပါ။"</string> + <string name="sim_added_message" msgid="7797975656153714319">"ဆဲလ်လူလာ ကွန်ရက်ကို ရယူသုံးရန် သင့် ကိရိယာကို ပြန်ဖွင့်ပေးပါ။"</string> <string name="sim_restart_button" msgid="4722407842815232347">"အစက ပြန်စရန်"</string> <string name="carrier_app_dialog_message" msgid="7066156088266319533">"သင့် SIM အသစ်ပုံမှန် အလုပ်လုပ်ရန်၊ သင်အသုံးပြုသည့် မိုဘိုင်းဝန်ဆောင်မှုမှ အက်ပ်တစ်ခုထည့်သွင်း၍ ဖွင့်ရန်လိုအပ်ပါသည်။"</string> <string name="carrier_app_dialog_button" msgid="7900235513678617329">"အက်ပ်ကို ရယူပါ"</string> @@ -1204,7 +1235,7 @@ <string name="vpn_lockdown_config" msgid="4655589351146766608">"ပြင်ဆင်သတ်မှတ်ရန် တို့ပါ"</string> <string name="upload_file" msgid="2897957172366730416">"ဖိုင်ရွေးချယ်ရန်"</string> <string name="no_file_chosen" msgid="6363648562170759465">"မည်သည့်ဖိုင်ကိုမှမရွေးပါ"</string> - <string name="reset" msgid="2448168080964209908">"ပြန်လည်စတင်စေရန်"</string> + <string name="reset" msgid="2448168080964209908">"ပြန်လည်သတ်မှတ်ရန်"</string> <string name="submit" msgid="1602335572089911941">"တင်ပြရန်"</string> <string name="car_mode_disable_notification_title" msgid="3164768212003864316">"ကားထဲတွင်အသုံးပြုနိုင်သောစနစ် ရရှိနိုင်သည်"</string> <string name="car_mode_disable_notification_message" msgid="6301524980144350051">"ကားမောင်းနှင်ခြင်းမုဒ်မှ ထွက်ရန် တို့ပါ။"</string> @@ -1231,7 +1262,7 @@ <string name="gpsNotifTitle" msgid="5446858717157416839">"တည်နေရာအား တောင်းခံသည်"</string> <string name="gpsNotifMessage" msgid="1374718023224000702">"<xliff:g id="NAME">%1$s</xliff:g> (<xliff:g id="SERVICE">%2$s</xliff:g>)မှတောင်းခံသည်"</string> <string name="gpsVerifYes" msgid="2346566072867213563">"ဟုတ်ကဲ့"</string> - <string name="gpsVerifNo" msgid="1146564937346454865">"မဟုတ်ပါ"</string> + <string name="gpsVerifNo" msgid="1146564937346454865">"No"</string> <string name="sync_too_many_deletes" msgid="5296321850662746890">"ပယ်ဖျက်မည့်ကန့်သတ်နှုန်းကျော်လွန်သည်"</string> <string name="sync_too_many_deletes_desc" msgid="496551671008694245">"<xliff:g id="TYPE_OF_SYNC">%2$s</xliff:g>၊ account <xliff:g id="ACCOUNT_NAME">%3$s</xliff:g> အတွက် စုစုပေါင်း <xliff:g id="NUMBER_OF_DELETED_ITEMS">%1$d</xliff:g> အရာဖျက်ထားပါသည်။ သင်ဘာလုပ်ချင်ပါလဲ?"</string> <string name="sync_really_delete" msgid="2572600103122596243">"ဤအရာများကိုဖျက်ပါ"</string> @@ -1259,7 +1290,7 @@ <string name="date_picker_prev_month_button" msgid="2858244643992056505">"ပြီးခဲ့သော လ"</string> <string name="date_picker_next_month_button" msgid="5559507736887605055">"လာမည့် လ"</string> <string name="keyboardview_keycode_alt" msgid="4856868820040051939">"Altခလုတ်"</string> - <string name="keyboardview_keycode_cancel" msgid="1203984017245783244">"ဖျက်သိမ်းရန် ခလုတ်"</string> + <string name="keyboardview_keycode_cancel" msgid="1203984017245783244">"မလုပ်တော့ပါ ခလုတ်"</string> <string name="keyboardview_keycode_delete" msgid="3337914833206635744">"ဖျက်ရန်ခလုတ်"</string> <string name="keyboardview_keycode_done" msgid="1992571118466679775">"ပြီးဆုံးသည့်ခလုတ်"</string> <string name="keyboardview_keycode_mode_change" msgid="4547387741906537519">"စနစ်ပြောင်းခြင်းခလုတ်"</string> @@ -1289,12 +1320,12 @@ <string name="data_usage_warning_body" msgid="6660692274311972007">"အသုံးပြုမှုနှင့် ဆက်တင်များကိုကြည့်ရန် တို့ပါ။"</string> <string name="data_usage_3g_limit_title" msgid="4361523876818447683">"2G-3G ဒေတာ ကန့်သတ်ချက် ပြည့်မီသွားပြီ"</string> <string name="data_usage_4g_limit_title" msgid="4609566827219442376">"4G ဒေတာ ကန့်သတ်ချက် ပြည့်မီသွားပြီ"</string> - <string name="data_usage_mobile_limit_title" msgid="557158376602636112">"ဆယ်လူလာ ဒေတာ ကန့်သတ်ချက် ပြည့်မီသွားပြီ"</string> + <string name="data_usage_mobile_limit_title" msgid="557158376602636112">"ဆဲလ်လူလာ ဒေတာ ကန့်သတ်ချက် ပြည့်မီသွားပြီ"</string> <string name="data_usage_wifi_limit_title" msgid="5803363779034792676">"ကြိုးမဲ့ ဒေတာ ကန့်သတ်ချက် ပြည့်မီသွားပြီ"</string> <string name="data_usage_limit_body" msgid="291731708279614081">"ကျန် စက်ဝန်း အတွက် ဒေတာကို ဆိုင်းငံ့ထား"</string> <string name="data_usage_3g_limit_snoozed_title" msgid="7026739121138005231">"သတ်မှတ်ထားသော2G-3Gဒေတာအားကျော်လွန်နေသည်"</string> <string name="data_usage_4g_limit_snoozed_title" msgid="1106562779311209039">"သတ်မှတ်ထားသော4Gဒေတာအားကျော်လွန်နေသည်"</string> - <string name="data_usage_mobile_limit_snoozed_title" msgid="4941346653729943789">"ဆယ်လူလာ ကန့်သတ်ချက် ကျော်လွန်သွားပြီ"</string> + <string name="data_usage_mobile_limit_snoozed_title" msgid="4941346653729943789">"ဆဲလ်လူလာ ကန့်သတ်ချက် ကျော်လွန်သွားပြီ"</string> <string name="data_usage_wifi_limit_snoozed_title" msgid="8743856006384825974">"သတ်မှတ်ဝိုင်ဖိုင်ဒေတာထက်ကျော်နေ"</string> <string name="data_usage_limit_snoozed_body" msgid="7035490278298441767">"သက်မှတ်နှုန်းထက် <xliff:g id="SIZE">%s</xliff:g> ကျော်နေပါသည်"</string> <string name="data_usage_restricted_title" msgid="5965157361036321914">"နောက်ခံဒေတာ ကန့်သတ်ထားသည်"</string> @@ -1366,7 +1397,7 @@ <string name="kg_invalid_puk" msgid="3638289409676051243">"ပင်နံပါတ် ပြန်ဖွင့်သည့် ကုဒ်ကို ပြန်လည် ရိုက်ထည့်ပါ.။ ထပ်ခါ ထပ်ခါ ကြိုးစားခြင်းသည် ဆင်းမ်ကဒ်ကို အသုံးပြုမရအောင် ဖြစ်နေနိုင်ပါသည်။"</string> <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"ပင် နံပါတ် မတူညီပါ"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"မြောက်မြားစွာ ပုံစံဆွဲ သော့ဖွင့်မှု"</string> - <string name="kg_login_instructions" msgid="1100551261265506448">"သော့ဖွင့်ရန် သင့်ရဲ့ ဂူဂယ်လ် အကောင့်ဖြင့် ဝင်ပါ"</string> + <string name="kg_login_instructions" msgid="1100551261265506448">"သော့ဖွင့်ရန် သင့်ရဲ့ Google အကောင့်ဖြင့် ဝင်ပါ"</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"သုံးစွဲသူအမည် (အီးမေးလ်)"</string> <string name="kg_login_password_hint" msgid="9057289103827298549">"စကားဝှက်"</string> <string name="kg_login_submit_button" msgid="5355904582674054702">"ဝင်ပါ"</string> @@ -1398,7 +1429,7 @@ <string name="error_message_title" msgid="4510373083082500195">"အမှား"</string> <string name="error_message_change_not_allowed" msgid="1347282344200417578">"ဒီအပြောင်းအလဲမျိုးကို သင့် စီမံအုပ်ချုပ်သူမှ ခွင့်မပြုပါ"</string> <string name="app_not_found" msgid="3429141853498927379">"ဤလုပ်ဆောင်ချက်ကို ပြုလုပ်ပေးမည့် အက်ပ် မရှိပါ။"</string> - <string name="revoke" msgid="5404479185228271586">"ဖျက်သိမ်းရန်"</string> + <string name="revoke" msgid="5404479185228271586">"မလုပ်တော့ပါ"</string> <string name="mediasize_iso_a0" msgid="1994474252931294172">"အိုက်အက်စ်အို အေ ဝ"</string> <string name="mediasize_iso_a1" msgid="3333060421529791786">"အိုက်အက်စ်အို အေ၁"</string> <string name="mediasize_iso_a2" msgid="3097535991925798280">"အိုက်အက်စ်အို အေ ၂"</string> @@ -1480,7 +1511,7 @@ <string name="mediasize_japanese_kahu" msgid="6872696027560065173">"ကဟူ"</string> <string name="mediasize_japanese_kaku2" msgid="2359077233775455405">"ကဟူ၂"</string> <string name="mediasize_japanese_you4" msgid="2091777168747058008">"ယူ၄"</string> - <string name="mediasize_unknown_portrait" msgid="3088043641616409762">"ဒေါင်လိုက် အရွယ်မသိ"</string> + <string name="mediasize_unknown_portrait" msgid="3088043641616409762">"ထောင်လိုက် အရွယ်မသိ"</string> <string name="mediasize_unknown_landscape" msgid="4876995327029361552">"အလျားလိုက် အရွယ်မသိ"</string> <string name="write_fail_reason_cancelled" msgid="7091258378121627624">"ဖျက်သိမ်းလိုက်ပြီး"</string> <string name="write_fail_reason_cannot_write" msgid="8132505417935337724">"အချက်အလက်များ ရိုက်ကူးစဉ် အမှားပေါ်နေ"</string> @@ -1515,7 +1546,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> ကို ဖျက်ပြီးပါပြီ"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"အလုပ် <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"ဤမျက်နှာပြင်ကို ပင်ဖြုတ်ရန် \"နောက်သို့\" ကိုထိပြီးဖိထားပါ။"</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"ဤမျက်နှာပြင်ကို ပင်ဖြုတ်ရန် \"ခြုံငုံကြည့်ခြင်း\" ကိုထိပြီးဖိထားပါ။"</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Appကို ပင်ထိုးထားသည်။ ပင်ဖျက်ခြင်းကို ဒီစက်မှာ မရနိုင်ပါ။"</string> <string name="lock_to_app_start" msgid="6643342070839862795">"မျက်နှာပြင်ကို ပင်ထိုးထား"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"မျက်နှာပြင် ပင်ထိုးမှု ဖြတ်လိုက်ပြီ"</string> @@ -1525,7 +1555,7 @@ <string name="package_installed_device_owner" msgid="8420696545959087545">"သင့် အက်ဒမင်မှ သွင်းယူထား၏"</string> <string name="package_updated_device_owner" msgid="8856631322440187071">"သင့်စီမံခန့်ခွဲသူမှ အဆင့်မြှင့်ထားပါသည်။"</string> <string name="package_deleted_device_owner" msgid="7650577387493101353">"သင့် အက်ဒမင်အား ဖျက်ပစ်ရန်"</string> - <string name="battery_saver_description" msgid="1960431123816253034">"ဘက်ထရီသက်တမ်း ကြာရှည်ခံရန်၊ ဘက်ထရီအားထိန်းသည် သင့်ကိရိယာ၏ ဆောင်ရွက်ချက်ကို လျှော့ပေးပြီး တုန်ခါမှု၊ တည်နေရာဝန်ဆောင်မှုများနှင့်၊ နောက်ခံဒေတာအများစုကို ကန့်သတ်ပေး၏။ စင့်လုပ်ပေးရလေ့ရှိသည့် အီးမေး၊ စာပို့ခြင်းနှင့်၊ အခြားအပလီကေးရှင်းများကို ၎င်းတို့အား သင် ဖွင့်မှသာ အဆင့်မြှင့်မွမ်းမံမည်ဖြစ်၏။ \n\n ကိရိယာအား အားသွင်းနေစဉ် ဘက်ထရီအားထိန်းအား အလိုအလျောက် ပိတ်ထားသည်။"</string> + <string name="battery_saver_description" msgid="1960431123816253034">"ဘက်ထရီသက်တမ်း ကြာရှည်ခံရန်၊ ဘက်ထရီအားထိန်းသည် သင့်ကိရိယာ၏ ဆောင်ရွက်ချက်ကို လျှော့ပေးပြီး တုန်ခါမှု၊ တည်နေရာဝန်ဆောင်မှုများနှင့်၊ နောက်ခံဒေတာအများစုကို ကန့်သတ်ပေး၏။ စင့်လုပ်ပေးရလေ့ရှိသည့် အီးမေးလ်၊ စာပို့ခြင်းနှင့်၊ အခြားအပလီကေးရှင်းများကို ၎င်းတို့အား သင် ဖွင့်မှသာ အဆင့်မြှင့်မွမ်းမံမည်ဖြစ်၏။ \n\n ကိရိယာအား အားသွင်းနေစဉ် ဘက်ထရီအားထိန်းအား အလိုအလျောက် ပိတ်ထားသည်။"</string> <string name="data_saver_description" msgid="6015391409098303235">"ဒေတာအသုံးလျှော့ချနိုင်ရန် အက်ပ်များကို နောက်ခံတွင် ဒေတာပို့ခြင်းနှင့် လက်ခံခြင်းမရှိစေရန် ဒေတာချွေတာမှုစနစ်က တားဆီးထားပါသည်။ ယခုအက်ပ်ဖြင့် ဒေတာအသုံးပြုနိုင်သော်လည်း အကြိမ်လျှော့၍သုံးရပါမည်။ ဥပမာ၊ သင် မတို့မချင်း ပုံများပေါ်လာမည် မဟုတ်ပါ။"</string> <string name="data_saver_enable_title" msgid="4674073932722787417">"ဒေတာအသုံးပြုမှု ချွေတာမှုစနစ်ကို ဖွင့်မလား။"</string> <string name="data_saver_enable_button" msgid="7147735965247211818">"ဖွင့်ပါ"</string> @@ -1567,7 +1597,7 @@ <string name="zen_mode_forever_dnd" msgid="3792132696572189081">"မနှောင့်ယှက်ရန် ကိုသင်ပိတ်သည်အထိ"</string> <string name="zen_mode_rule_name_combination" msgid="191109939968076477">"<xliff:g id="FIRST">%1$s</xliff:g> / <xliff:g id="REST">%2$s</xliff:g>"</string> <string name="toolbar_collapse_description" msgid="2821479483960330739">"ခေါက်ရန်"</string> - <string name="zen_mode_feature_name" msgid="5254089399895895004">"မနှောက်ယှက်ပါနှင့်"</string> + <string name="zen_mode_feature_name" msgid="5254089399895895004">"မနှောင့်ယှက်ရ"</string> <string name="zen_mode_downtime_feature_name" msgid="2626974636779860146">"ကျချိန်"</string> <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"ကြားရက်ည"</string> <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"စနေ၊တနင်္ဂနွေ"</string> @@ -1582,6 +1612,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"USSD တောင်းဆိုချက်အရ SS တောင်းဆိုချက်အား ပြင်ဆင်ထား၏။"</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS တောင်းဆိုချက်အရ SS တောင်းဆိုချက်အား ပြင်ဆင်ထား၏။"</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"အလုပ်ကိုယ်ရေးအချက်အလက်"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"တိုးချဲ့ရန်ခလုတ်"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"ချဲ့ခြင်းခလုတ်"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB ဘေးဘက်အပေါက်"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"အန်းဒရွိုက်"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB ဘေးရှိပို့တ်"</string> @@ -1589,6 +1621,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"ကိရိယာဘားအပိုအား ပိတ်ရန်"</string> <string name="maximize_button_text" msgid="7543285286182446254">"အများဆုံး လုပ်ပေးရန်"</string> <string name="close_button_text" msgid="3937902162644062866">"ပိတ်ရန်"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ရွေးချယ်ပြီးပါပြီ</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ရွေးချယ်ပြီးပါပြီ</item> @@ -1621,4 +1655,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"ဤစက်ပစ္စည်းကို ကန့်သတ်ချက်များမပါဘဲ အသုံးပြုရန် စက်ရုံထုတ်ဆက်တင်အတိုင်း ပြန်လည်သတ်မှတ်ပါ"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"ပိုမိုလေ့လာရန် တို့ပါ။"</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"ပိတ်ထားသည့် <xliff:g id="LABEL">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index 7452f3a9386c..a108a3af9bec 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -891,6 +891,38 @@ <item quantity="other">om <xliff:g id="COUNT_1">%d</xliff:g> år</item> <item quantity="one">om <xliff:g id="COUNT_0">%d</xliff:g> år</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other">for <xliff:g id="COUNT_1">%d</xliff:g> minutter siden</item> + <item quantity="one">for <xliff:g id="COUNT_0">%d</xliff:g> minutt siden</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other">for <xliff:g id="COUNT_1">%d</xliff:g> timer siden</item> + <item quantity="one">for <xliff:g id="COUNT_0">%d</xliff:g> time siden</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other">for <xliff:g id="COUNT_1">%d</xliff:g> dager siden</item> + <item quantity="one">for <xliff:g id="COUNT_0">%d</xliff:g> dag siden</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other">for <xliff:g id="COUNT_1">%d</xliff:g> år siden</item> + <item quantity="one">for <xliff:g id="COUNT_0">%d</xliff:g> år siden</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other">om <xliff:g id="COUNT_1">%d</xliff:g> minutter</item> + <item quantity="one">om <xliff:g id="COUNT_0">%d</xliff:g> minutt</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other">om <xliff:g id="COUNT_1">%d</xliff:g> timer</item> + <item quantity="one">om <xliff:g id="COUNT_0">%d</xliff:g> time</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other">om <xliff:g id="COUNT_1">%d</xliff:g> dager</item> + <item quantity="one">om <xliff:g id="COUNT_0">%d</xliff:g> dag</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other">om <xliff:g id="COUNT_1">%d</xliff:g> år</item> + <item quantity="one">om <xliff:g id="COUNT_0">%d</xliff:g> år</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Videoproblem"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Denne videoen er ikke gyldig for direkteavspilling på enheten."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Kan ikke spille av denne videoen."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> har stoppet"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> stopper gjentatte ganger"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> stopper gjentatte ganger"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Start appen på nytt"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Tilbakestill appen, og start den på nytt"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Åpne appen på nytt"</string> <string name="aerr_report" msgid="5371800241488400617">"Send tilbakemelding"</string> <string name="aerr_close" msgid="2991640326563991340">"Lukk"</string> <string name="aerr_mute" msgid="1974781923723235953">"Ignorer frem til enheten starter på nytt"</string> @@ -1512,12 +1543,11 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> er slettet"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"Jobb-<xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"For å løsne denne skjermen, trykk og hold inne Tilbake."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"For å løsne denne skjermen, trykk og hold inne Oversikt."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Appen er festet – du kan ikke løsne apper på denne enheten."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Skjermen er festet"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Skjermen er løsnet"</string> <string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"PIN-kode for å løsne apper"</string> - <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Krev bruk av opplåsningsmønster for å løsne apper"</string> + <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Krev opplåsingsmønster for å løsne apper"</string> <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Krev passord for å løsne apper"</string> <string name="package_installed_device_owner" msgid="8420696545959087545">"Installert av administratoren"</string> <string name="package_updated_device_owner" msgid="8856631322440187071">"Oppdatert av administratoren"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS-forespørselen er endret til en USSD-forespørsel."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS-forespørselen er endret til en ny SS-forespørsel."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Arbeidsprofil"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Knapp for å vise mer"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"slå utvidelse av/på"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Port for USB-tilleggsutstyr for Android"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"Port for USB-tilleggsutstyr"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Lukk overflytsmenyen"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Maksimer"</string> <string name="close_button_text" msgid="3937902162644062866">"Lukk"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> er valgt</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> er valgt</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Tilbakestill til fabrikkstandard for å bruke denne enheten uten begrensninger"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Trykk for å finne ut mer."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> er slått av"</string> </resources> diff --git a/core/res/res/values-ne-rNP/strings.xml b/core/res/res/values-ne-rNP/strings.xml index e2b6c6414471..550239354b5d 100644 --- a/core/res/res/values-ne-rNP/strings.xml +++ b/core/res/res/values-ne-rNP/strings.xml @@ -357,7 +357,7 @@ <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"अधिक स्थान प्रदायक आदेशहरू पहुँच गर्नुहोस्"</string> <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"अनुप्रयोगलाई अतिरिक्त स्थान प्रदायक आदेशहरू पहुँच गर्न अनुमति दिन्छ। यो अनुप्रयोगलाई GPS वा अन्य स्थान स्रोतहरूको संचालन साथै हस्तक्षेप गर्न अनुमति दिन सक्छ।"</string> <string name="permlab_accessFineLocation" msgid="251034415460950944">"सटीक स्थान पहुँच गराउनुहोस् (GPS तथा नेटवर्कमा आधारित)"</string> - <string name="permdesc_accessFineLocation" msgid="5295047563564981250">"अनुप्रयोगले विश्वव्यापी स्थान प्रणाली (GPS) वा सेल टावरहरू र वाइफाइ जस्ता नेटवर्क स्थान स्रोतहरूको प्रयोग गरेर तपाईँको सही स्थान प्राप्त गर्न अनुमति दिन्छ। यी स्थान सेवाहरू खोल्नु पर्छ र अनुप्रयोगहरूका लागि प्रयोग गर्न तपाईँको उपकरणमा उपलब्ध हुनु पर्छ। अनुप्रयोगहरूले तपाईँ कहाँ हुनु हुन्छ भन्ने निर्धारण गर्न यसलाई प्रयोग गर्न सक्छ र यसले अतिरिक्त ब्याट्री उर्जा खतप गर्न सक्छ।"</string> + <string name="permdesc_accessFineLocation" msgid="5295047563564981250">"अनुप्रयोगले विश्वव्यापी स्थान प्रणाली (GPS) वा सेल टावरहरू र Wi-Fi जस्ता नेटवर्क स्थान स्रोतहरूको प्रयोग गरेर तपाईँको सही स्थान प्राप्त गर्न अनुमति दिन्छ। यी स्थान सेवाहरू खोल्नु पर्छ र अनुप्रयोगहरूका लागि प्रयोग गर्न तपाईँको उपकरणमा उपलब्ध हुनु पर्छ। अनुप्रयोगहरूले तपाईँ कहाँ हुनु हुन्छ भन्ने निर्धारण गर्न यसलाई प्रयोग गर्न सक्छ र यसले अतिरिक्त ब्याट्री उर्जा खतप गर्न सक्छ।"</string> <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"अनुमानित स्थान पहुँच गराउनुहोस् (नेटवर्कमा आधारित)"</string> <string name="permdesc_accessCoarseLocation" msgid="2538200184373302295">"अनुप्रयोगलाई तपाईँको अनुमानित स्थान प्राप्त गर्न अनुमति दिन्छ। यो स्थान सेल टावर र वाइ-फाइजस्ता नेटवर्क स्थान स्रोतहरूको प्रोग गरी स्थान सेवाहरूबाट उत्पन्न गरिएको हो। अनुप्रयोगले यी स्थान सेवाहरूको उपयोग गर्नको लागि यी सेवाहरू तपाईँको उपकरणमा चालु र उपलब्ध हुनु आवश्यक छ। अनुप्रयोगहरूले अनुमानित रूपमा तपाईँ कहाँ हुनुहुन्छ भन्ने निर्धारण गर्न यसको प्रयोग गर्न सक्छन्।"</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"तपाईँका अडियो सेटिङहरू परिवर्तन गर्नुहोस्"</string> @@ -406,14 +406,14 @@ <string name="permdesc_changeNetworkState" msgid="6789123912476416214">"अनुप्रयोगलाई नेटवर्क जडानको स्थिति परिवर्तन गर्न अनुमति दिन्छ।"</string> <string name="permlab_changeTetherState" msgid="5952584964373017960">"टेथर्ड नेटवर्क जडान परिवर्तन गर्नुहोस्"</string> <string name="permdesc_changeTetherState" msgid="1524441344412319780">"टेदर गरेको नेटवर्क जडानको स्थिति बदल्न अनुप्रयोगलाई अनुमति दिन्छ।"</string> - <string name="permlab_accessWifiState" msgid="5202012949247040011">"वाइफाइ जडानहरू हेर्नुहोस्"</string> - <string name="permdesc_accessWifiState" msgid="5002798077387803726">"अनुप्रयोगलाई वाइफाइ नेटवर्कको बारेमा जानकारी हेर्न अनुमति दिन्छ, जस्तै कि वाइफाइ सक्षम छ कि छैन र जडान गरिएको वाइफाइ उपकरणहरूको नाम।"</string> + <string name="permlab_accessWifiState" msgid="5202012949247040011">"Wi-Fi जडानहरू हेर्नुहोस्"</string> + <string name="permdesc_accessWifiState" msgid="5002798077387803726">"अनुप्रयोगलाई Wi-Fi नेटवर्कको बारेमा जानकारी हेर्न अनुमति दिन्छ, जस्तै कि Wi-Fi सक्षम छ कि छैन र जडान गरिएको Wi-Fi उपकरणहरूको नाम।"</string> <string name="permlab_changeWifiState" msgid="6550641188749128035">"वाइ-फाइसँग जोड्नुहोस् वा छुटाउनुहोस्"</string> - <string name="permdesc_changeWifiState" msgid="7137950297386127533">"अनुप्रयोगलाई वाइफाइ पहुँच बिन्दुबाट जडान गर्न र विच्छेदन गर्न र वाइफाइ नेटवर्कहरूको लागि उपकरण कन्फिगरेसनमा परिवर्तनहरू गर्न अनुमति दिन्छ।"</string> - <string name="permlab_changeWifiMulticastState" msgid="1368253871483254784">"वाइफाइ Multicast स्विकृतिलाई अनुमति दिनुहोस्"</string> - <string name="permdesc_changeWifiMulticastState" product="tablet" msgid="7969774021256336548">"अनुप्रयोगलाई मल्टिकाष्ट ठेगानाहरू प्रयोग गरेर वाइफाइ नेटवर्कमा पठाइएको प्याकेटहरू प्राप्त गर्न अनुमति दिन्छ, केवल तपाईंको ट्याब्लेट मात्र होइन। यसले गैर-मल्टिकाष्ट मोड भन्दा बढी उर्जा प्रयोग गर्दछ।"</string> + <string name="permdesc_changeWifiState" msgid="7137950297386127533">"अनुप्रयोगलाई Wi-Fi पहुँच बिन्दुबाट जडान गर्न र विच्छेदन गर्न र Wi-Fi नेटवर्कहरूको लागि उपकरण कन्फिगरेसनमा परिवर्तनहरू गर्न अनुमति दिन्छ।"</string> + <string name="permlab_changeWifiMulticastState" msgid="1368253871483254784">"Wi-Fi Multicast स्विकृतिलाई अनुमति दिनुहोस्"</string> + <string name="permdesc_changeWifiMulticastState" product="tablet" msgid="7969774021256336548">"अनुप्रयोगलाई मल्टिकाष्ट ठेगानाहरू प्रयोग गरेर Wi-Fi नेटवर्कमा पठाइएको प्याकेटहरू प्राप्त गर्न अनुमति दिन्छ, केवल तपाईंको ट्याब्लेट मात्र होइन। यसले गैर-मल्टिकाष्ट मोड भन्दा बढी उर्जा प्रयोग गर्दछ।"</string> <string name="permdesc_changeWifiMulticastState" product="tv" msgid="9031975661145014160">"अनुप्रयोगलाई अनुमति दिन्छ प्याकेटहरू प्राप्त गर्न एक Wi-Fi सञ्जालमा अवस्थित सम्पूर्ण यन्त्रहरूमा बहुकास्ट ठेगानाहरू प्रयोग गरेर, तपाईँको TVमा मात्र नभई।यसले गैर-मल्टिकास्ट मोडभन्दा बढि बिधुतीय शक्ति प्रयोग गर्दछ।"</string> - <string name="permdesc_changeWifiMulticastState" product="default" msgid="6851949706025349926">"तपाईँको फोन मात्र होइन, मल्टिकास्ट ठेगानाहरूको प्रयोग गरे वाइफाइ नेटवर्कका सबै उपकरणहरूमा पठाइएका प्याकेटहरू प्राप्त गर्न अनुप्रयोगलाई अनुमति दिन्छ। यसले गैर-मल्टिकास्ट मोडभन्दा बढी उर्जा प्रयोग गर्छ।"</string> + <string name="permdesc_changeWifiMulticastState" product="default" msgid="6851949706025349926">"तपाईँको फोन मात्र होइन, मल्टिकास्ट ठेगानाहरूको प्रयोग गरे Wi-Fi नेटवर्कका सबै उपकरणहरूमा पठाइएका प्याकेटहरू प्राप्त गर्न अनुप्रयोगलाई अनुमति दिन्छ। यसले गैर-मल्टिकास्ट मोडभन्दा बढी उर्जा प्रयोग गर्छ।"</string> <string name="permlab_bluetoothAdmin" msgid="6006967373935926659">"ब्लुटुथ सेटिङहरूमा पहुँच गर्नुहोस्"</string> <string name="permdesc_bluetoothAdmin" product="tablet" msgid="6921177471748882137">"स्थानीय ब्लुटुथ ट्याब्लेटलाई कन्फिगर गर्नको लागि र टाढाका उपकरणहरूलाई पत्ता लगाउन र जोड्नको लागि अनुप्रयोगलाई अनुमति दिन्छ।"</string> <string name="permdesc_bluetoothAdmin" product="tv" msgid="3373125682645601429">"अनुप्रयोगलाई स्थानीय ब्लुटूथ TV कन्फिगर गर्न र पत्ता लगाउन र टाढाका यन्त्रहरूसँग जोडी बनाउन अनुमति दिन्छ।"</string> @@ -721,7 +721,7 @@ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"पासवर्ड:"</string> <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"साइन इन गर्नुहोस्"</string> <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"अमान्य प्रयोगकर्तानाम वा पासवर्ड"</string> - <string name="lockscreen_glogin_account_recovery_hint" msgid="1696924763690379073">"तपाईँको प्रयोगकर्ता नाम वा पासवर्ड बिर्सनुभयो?\n भ्रमण गर्नुहोस"<b>"google.com/accounts/recovery"</b></string> + <string name="lockscreen_glogin_account_recovery_hint" msgid="1696924763690379073">"तपाईँको एक-पटके पाठ सन्देश वा पासवर्ड बिर्सनुभयो?\n भ्रमण गर्नुहोस"<b>"google.com/accounts/recovery"</b></string> <string name="lockscreen_glogin_checking_password" msgid="7114627351286933867">"जाँच गर्दै..."</string> <string name="lockscreen_unlock_label" msgid="737440483220667054">"खोल्नुहोस्"</string> <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"आवाज चालु छ।"</string> @@ -891,6 +891,38 @@ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> वर्षमा</item> <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> वर्षमा</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> मिनेट अघि</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> मिनेट अघि</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> घन्टा अघि</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> घन्टा अघि</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> दिन अघि</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> दिन अघि</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> वर्ष अघि</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> वर्ष अघि</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> मिनेटमा</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> मिनेटमा</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> घन्टामा</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> घन्टामा</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> दिनमा</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> दिनमा</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> वर्षमा</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> वर्षमा</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"भिडियो समस्या"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"यो भिडियो यस उपकरणको लागि स्ट्रिमिङ गर्न मान्य छैन।"</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"यो भिडियो चलाउन सक्दैन।"</string> @@ -968,8 +1000,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> रोकिएको छ"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> रोकिरहन्छ"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> रोकिरहन्छ"</string> - <string name="aerr_restart" msgid="9001379185665886595">"अनुप्रयोगलाई पुन: सुरु गर्नुहोस्"</string> - <string name="aerr_reset" msgid="7645427603514220451">"अनुप्रयोगलाई रिसेट गरी पुन: सुरु गर्नुहोस्"</string> + <string name="aerr_restart" msgid="7581308074153624475">"अनुप्रयोगलाई फेरि खोल्नुहोस्"</string> <string name="aerr_report" msgid="5371800241488400617">"प्रतिक्रिया पठाउनुहोस्"</string> <string name="aerr_close" msgid="2991640326563991340">"बन्द गर्नुहोस्"</string> <string name="aerr_mute" msgid="1974781923723235953">"यन्त्र पुनः सुरु नभएसम्म म्यूट गर्नुहोस्"</string> @@ -1041,7 +1072,7 @@ <item quantity="other"> खुल्ला Wi-Fi सञ्जालहरू उपलब्ध छन्</item> <item quantity="one">खुल्ला Wi-Fi सञ्जाल उपलब्ध छ</item> </plurals> - <string name="wifi_available_sign_in" msgid="9157196203958866662">"वाइफाइ नेटवर्कमा साइन इन गर्नुहोस्"</string> + <string name="wifi_available_sign_in" msgid="9157196203958866662">"Wi-Fi नेटवर्कमा साइन इन गर्नुहोस्"</string> <string name="network_available_sign_in" msgid="1848877297365446605">"सञ्जालमा साइन इन गर्नुहोस्"</string> <!-- no translation found for network_available_sign_in_detailed (8000081941447976118) --> <skip /> @@ -1052,10 +1083,10 @@ <string name="wifi_connect_alert_title" msgid="8455846016001810172">"जडान अनुमति दिने हो?"</string> <string name="wifi_connect_alert_message" msgid="6451273376815958922">"अनुप्रयोग %1$s Wifi सञ्जाल %2$s मा जडान गर्न चाहन्छ"</string> <string name="wifi_connect_default_application" msgid="7143109390475484319">"एउटा अनुप्रयोग"</string> - <string name="wifi_p2p_dialog_title" msgid="97611782659324517">"वाइफाइ प्रत्यक्ष"</string> - <string name="wifi_p2p_turnon_message" msgid="2909250942299627244">"वाइफाइ सिधा सुरु गर्नुहोस्। यसले वाइफाइ ग्राहक/हट्स्पटलाई बन्द गराउने छ।"</string> - <string name="wifi_p2p_failed_message" msgid="3763669677935623084">"वाइफाइ सिधा सुरु हुन सकेन।"</string> - <string name="wifi_p2p_enabled_notification_title" msgid="2068321881673734886">"वाइफाइ प्रत्यक्ष खुल्ला छ"</string> + <string name="wifi_p2p_dialog_title" msgid="97611782659324517">"Wi-Fi प्रत्यक्ष"</string> + <string name="wifi_p2p_turnon_message" msgid="2909250942299627244">"Wi-Fi सिधा सुरु गर्नुहोस्। यसले Wi-Fi ग्राहक/हट्स्पटलाई बन्द गराउने छ।"</string> + <string name="wifi_p2p_failed_message" msgid="3763669677935623084">"Wi-Fi सिधा सुरु हुन सकेन।"</string> + <string name="wifi_p2p_enabled_notification_title" msgid="2068321881673734886">"Wi-Fi प्रत्यक्ष खुल्ला छ"</string> <string name="wifi_p2p_enabled_notification_message" msgid="8064677407830620023">"सेटिङहरूका लागि ट्याप गर्नुहोस्"</string> <string name="accept" msgid="1645267259272829559">"स्वीकार्नुहोस्"</string> <string name="decline" msgid="2112225451706137894">"अस्वीकार गर्नुहोस्"</string> @@ -1242,7 +1273,7 @@ <string name="sync_do_nothing" msgid="3743764740430821845">"अहिलेको लागि केही नगर्नुहोस्"</string> <string name="choose_account_label" msgid="5655203089746423927">"एउटा खाता छान्नुहोस्"</string> <string name="add_account_label" msgid="2935267344849993553">"एउटा खाता थप्नुहोस्"</string> - <string name="add_account_button_label" msgid="3611982894853435874">"खाता थप गर्नुहोस्"</string> + <string name="add_account_button_label" msgid="3611982894853435874">"खाता थप्नुहोस्"</string> <string name="number_picker_increment_button" msgid="2412072272832284313">"बढाउनुहोस्"</string> <string name="number_picker_decrement_button" msgid="476050778386779067">"घटाउनुहोस्"</string> <string name="number_picker_increment_scroll_mode" msgid="5259126567490114216">"<xliff:g id="VALUE">%s</xliff:g> छोइराख्नुहोस्।"</string> @@ -1288,17 +1319,17 @@ <string name="storage_usb_drive_label" msgid="4501418548927759953">"<xliff:g id="MANUFACTURER">%s</xliff:g> USB ड्राइभ"</string> <string name="storage_usb" msgid="3017954059538517278">"USB भण्डारण"</string> <string name="extract_edit_menu_button" msgid="8940478730496610137">"सम्पादन गर्नुहोस्"</string> - <string name="data_usage_warning_title" msgid="1955638862122232342">"डेटा प्रयोग चेतावनी"</string> + <string name="data_usage_warning_title" msgid="1955638862122232342">"डेटाको प्रयोग चेतावनी"</string> <string name="data_usage_warning_body" msgid="6660692274311972007">"प्रयोग र सेटिङहरू हेर्न ट्याप गर्नुहोस्।"</string> <string name="data_usage_3g_limit_title" msgid="4361523876818447683">"2G-3G डेटा सीमा पुग्यो"</string> <string name="data_usage_4g_limit_title" msgid="4609566827219442376">"4G डेटा सीमा पुग्यो"</string> <string name="data_usage_mobile_limit_title" msgid="557158376602636112">"सेलुलर डेटा सीमा पुग्यो"</string> - <string name="data_usage_wifi_limit_title" msgid="5803363779034792676">"वाइफाइ डेटा सीमा पुग्यो"</string> + <string name="data_usage_wifi_limit_title" msgid="5803363779034792676">"Wi-Fi डेटा सीमा पुग्यो"</string> <string name="data_usage_limit_body" msgid="291731708279614081">"तथ्याङ्क बाँकी चक्रको लागि रोकिएको छ"</string> <string name="data_usage_3g_limit_snoozed_title" msgid="7026739121138005231">"2G-3G डेटा सीमा भन्दा पार भएको छ"</string> <string name="data_usage_4g_limit_snoozed_title" msgid="1106562779311209039">"4G डेटा SIMा नाघ्यो"</string> <string name="data_usage_mobile_limit_snoozed_title" msgid="4941346653729943789">"सेलुलर डेटा सीमा नाघ्यो"</string> - <string name="data_usage_wifi_limit_snoozed_title" msgid="8743856006384825974">"वाइफाइ डेटा SIMा नाघ्यो"</string> + <string name="data_usage_wifi_limit_snoozed_title" msgid="8743856006384825974">"Wi-Fi डेटा SIMा नाघ्यो"</string> <string name="data_usage_limit_snoozed_body" msgid="7035490278298441767">"<xliff:g id="SIZE">%s</xliff:g> उल्लेखित सीमा भन्दा बढी छ।"</string> <string name="data_usage_restricted_title" msgid="5965157361036321914">"पृष्ठभूमिका डेटा प्रतिबन्धित गरिएको छ"</string> <string name="data_usage_restricted_body" msgid="469866376337242726">"सीमिततालाई हटाउन ट्याप गर्नुहोस्।"</string> @@ -1370,7 +1401,7 @@ <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"PIN कोडहरू मेल खाएन"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"निकै धेरै ढाँचा कोसिसहरू"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"अनलक गर्नको लागि, तपाईँको Google खाताको साथ साइन इन गर्नुहोस्।"</string> - <string name="kg_login_username_hint" msgid="5718534272070920364">"प्रयोगकर्ता नाम (इमेल)"</string> + <string name="kg_login_username_hint" msgid="5718534272070920364">"एक-पटके पाठ सन्देश (इमेल)"</string> <string name="kg_login_password_hint" msgid="9057289103827298549">"पासवर्ड"</string> <string name="kg_login_submit_button" msgid="5355904582674054702">"साइन इन गर्नुहोस्"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"अमान्य प्रयोगकर्तानाम वा पासवर्ड।"</string> @@ -1518,12 +1549,11 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> हटाइयो"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"कार्य <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"यस स्क्रिनलाई अनपिन गर्न पछाडि बटनलाई छोइराख्नुहोस्।"</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"यस स्क्रिनलाई अनपिन गर्न परिदृश्य बटनलाई छोइराख्नुहोस्।"</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"अनुप्रयोग पिन गरियो: यस यन्त्रमा अनपिन गर्ने अनुमति छैन।"</string> <string name="lock_to_app_start" msgid="6643342070839862795">"स्क्रिन पिन गरियो"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"स्क्रिन अनपिन गरियो"</string> <string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"पिन निकाल्नुअघि PIN सोध्नुहोस्"</string> - <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"पिन निकाल्नुअघि खोल्ने रूपरेखा सोध्नुहोस्"</string> + <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"पिन निकाल्नुअघि खोल्ने ढाँचा सोध्नुहोस्"</string> <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"पिन निकाल्नुअघि पासवर्ड सोध्नुहोस्"</string> <string name="package_installed_device_owner" msgid="8420696545959087545">"तपाईँको प्रशासकद्वारा स्थापना गरिएको"</string> <string name="package_updated_device_owner" msgid="8856631322440187071">"तपाईँको प्रशासकद्वारा अद्यावधिक गरिएको"</string> @@ -1585,6 +1615,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS अनुरोध USSD अनुरोधमा परिमार्जन गरिएको छ।"</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS अनुरोध नयाँ SS अनुरोधमा परिमार्जन गरिएको छ।"</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"कार्य प्रोफाइल"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"विस्तृत गर्ने बटन"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"विस्तारलाई टगल गर्नुहोस्"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB पेरिफेरल पोर्ट"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB पेरिफेरल पोर्ट"</string> @@ -1592,6 +1624,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"ओभरफ्लो बन्द गर्नुहोस्"</string> <string name="maximize_button_text" msgid="7543285286182446254">"ठूलो बनाउनुहोस्"</string> <string name="close_button_text" msgid="3937902162644062866">"बन्द गर्नुहोस्"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> चयन गरियो</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> चयन गरियो</item> @@ -1624,4 +1658,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"यस यन्त्रलाई सीमितताहरू बिना प्रयोग गर्नका लागि फ्याक्ट्री रिसेट गर्नुहोस्"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"थप जान्नका लागि छुनुहोस्।"</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> लाई असक्षम गरियो"</string> </resources> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index 322b00710576..f2e863a8ac3c 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -891,6 +891,38 @@ <item quantity="other">over <xliff:g id="COUNT_1">%d</xliff:g> j</item> <item quantity="one">over <xliff:g id="COUNT_0">%d</xliff:g> j</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minuten geleden</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minuut geleden</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> uur geleden</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> uur geleden</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> dagen geleden</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> dag geleden</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> jaar geleden</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> jaar geleden</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other">over <xliff:g id="COUNT_1">%d</xliff:g> minuten</item> + <item quantity="one">over <xliff:g id="COUNT_0">%d</xliff:g> minuut</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other">over <xliff:g id="COUNT_1">%d</xliff:g> uur</item> + <item quantity="one">over <xliff:g id="COUNT_0">%d</xliff:g> uur</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other">over <xliff:g id="COUNT_1">%d</xliff:g> dagen</item> + <item quantity="one">over <xliff:g id="COUNT_0">%d</xliff:g> dag</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other">over <xliff:g id="COUNT_1">%d</xliff:g> jaar</item> + <item quantity="one">over <xliff:g id="COUNT_0">%d</xliff:g> jaar</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Probleem met video"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Deze video kan niet worden gestreamd naar dit apparaat."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Deze video kan niet worden afgespeeld."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> is gestopt"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> stopt steeds"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> stopt steeds"</string> - <string name="aerr_restart" msgid="9001379185665886595">"App opnieuw starten"</string> - <string name="aerr_reset" msgid="7645427603514220451">"App resetten en opnieuw starten"</string> + <string name="aerr_restart" msgid="7581308074153624475">"App opnieuw openen"</string> <string name="aerr_report" msgid="5371800241488400617">"Feedback verzenden"</string> <string name="aerr_close" msgid="2991640326563991340">"Sluiten"</string> <string name="aerr_mute" msgid="1974781923723235953">"Verbergen tot apparaat opnieuw wordt opgestart"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> verwijderd"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"Werk <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Tik op Terug en houd vast om dit scherm los te maken."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Tik op Overzicht en houd vast om dit scherm los te maken."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"App is vastgezet: losmaken is niet toegestaan op dit apparaat."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Scherm vastgezet"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Scherm losgemaakt"</string> @@ -1523,7 +1553,7 @@ <string name="package_updated_device_owner" msgid="8856631322440187071">"Geüpdatet door je beheerder"</string> <string name="package_deleted_device_owner" msgid="7650577387493101353">"Verwijderd door je beheerder"</string> <string name="battery_saver_description" msgid="1960431123816253034">"Accubesparing beperkt de prestaties van je apparaat, de trilstand, locatieservices en de meeste achtergrondgegevens om de gebruiksduur van de accu te verlengen.\n\nAccubesparing wordt automatisch uitgeschakeld terwijl je apparaat wordt opgeladen."</string> - <string name="data_saver_description" msgid="6015391409098303235">"Databesparing beperkt het datagebruik door te voorkomen dat sommige apps gegevens verzenden of ontvangen op de achtergrond. Een app die je momenteel gebruikt, kan data gebruiken, maar minder vaak. Dit kan bijvoorbeeld betekenen dat afbeeldingen niet worden weergegeven totdat je hierop tikt."</string> + <string name="data_saver_description" msgid="6015391409098303235">"Databesparing beperkt het datagebruik door te voorkomen dat sommige apps gegevens verzenden of ontvangen op de achtergrond. De apps die je open hebt, kunnen nog steeds data verbruiken, maar doen dit minder vaak. Afbeeldingen worden dan bijvoorbeeld niet weergegeven totdat je erop tikt."</string> <string name="data_saver_enable_title" msgid="4674073932722787417">"Databesparing inschakelen?"</string> <string name="data_saver_enable_button" msgid="7147735965247211818">"Inschakelen"</string> <plurals name="zen_mode_duration_minutes_summary" formatted="false" msgid="4367877408072000848"> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS-verzoek is gewijzigd in USSD-verzoek."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS-verzoek is gewijzigd in nieuw SS-verzoek."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Werkprofiel"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Knop voor uitvouwen"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"uitvouwen in-/uitschakelen"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Poort voor Android-USB-randapparatuur"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"Poort voor USB-randapparatuur"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Overloop sluiten"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Maximaliseren"</string> <string name="close_button_text" msgid="3937902162644062866">"Sluiten"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> geselecteerd</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> geselecteerd</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Zet dit apparaat terug op de fabrieksinstellingen om het zonder beperkingen te gebruiken"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Tik voor meer informatie."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> uitgeschakeld"</string> </resources> diff --git a/core/res/res/values-pa-rIN/strings.xml b/core/res/res/values-pa-rIN/strings.xml index 744fdb9a7a87..89a3dcf88753 100644 --- a/core/res/res/values-pa-rIN/strings.xml +++ b/core/res/res/values-pa-rIN/strings.xml @@ -191,7 +191,7 @@ <string name="screen_lock" msgid="799094655496098153">"ਸਕ੍ਰੀਨ ਲੌਕ"</string> <string name="power_off" msgid="4266614107412865048">"ਪਾਵਰ ਬੰਦ"</string> <string name="silent_mode_silent" msgid="319298163018473078">"ਰਿੰਗਰ ਬੰਦ"</string> - <string name="silent_mode_vibrate" msgid="7072043388581551395">"ਰਿੰਗਰ ਵਾਈਬ੍ਰੇਟ"</string> + <string name="silent_mode_vibrate" msgid="7072043388581551395">"ਰਿੰਗਰ ਥਰਥਰਾਹਟ"</string> <string name="silent_mode_ring" msgid="8592241816194074353">"ਰਿੰਗਰ ਚਾਲੂ"</string> <string name="reboot_to_update_title" msgid="6212636802536823850">"Android ਸਿਸਟਮ ਅਪਡੇਟ"</string> <string name="reboot_to_update_prepare" msgid="6305853831955310890">"ਅਪਡੇਟ ਦੀ ਤਿਆਰੀ ਕਰ ਰਿਹਾ ਹੈ…"</string> @@ -251,7 +251,7 @@ <string name="permgrouplab_sms" msgid="228308803364967808">"SMS"</string> <string name="permgroupdesc_sms" msgid="4656988620100940350">"SMS ਸੁਨੇਹੇ ਭੇਜੋ ਅਤੇ ਦਿਖਾਓ"</string> <string name="permgrouplab_storage" msgid="1971118770546336966">"ਸਟੋਰੇਜ"</string> - <string name="permgroupdesc_storage" msgid="637758554581589203">"ਆਪਣੀ ਡੀਵਾਈਸ ਤੇ ਫੋਟੋਆਂ, ਮੀਡੀਆ ਅਤੇ ਫਾਈਲਾਂ ਤੱਕ ਪਹੁੰਚੋ"</string> + <string name="permgroupdesc_storage" msgid="637758554581589203">"ਆਪਣੀ ਡੀਵਾਈਸ ’ਤੇ ਫੋਟੋਆਂ, ਮੀਡੀਆ ਅਤੇ ਫਾਈਲਾਂ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੇਣ"</string> <string name="permgrouplab_microphone" msgid="171539900250043464">"ਮਾਈਕ੍ਰੋਫੋਨ"</string> <string name="permgroupdesc_microphone" msgid="4988812113943554584">"ਔਡੀਓ ਰਿਕਾਰਡ ਕਰੋ"</string> <string name="permgrouplab_camera" msgid="4820372495894586615">"ਕੈਮਰਾ"</string> @@ -361,7 +361,7 @@ <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"ਅੰਦਾਜ਼ਨ ਟਿਕਾਣੇ \'ਤੇ ਪਹੁੰਚ ਕਰੋ (ਨੈੱਟਵਰਕ-ਆਧਾਰਿਤ)"</string> <string name="permdesc_accessCoarseLocation" msgid="2538200184373302295">"ਐਪ ਨੂੰ ਤੁਹਾਡਾ ਅਨੁਮਾਨਿਤ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਪ੍ਰਾਪਤ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ। ਇਹ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਨੈੱਟਵਰਕ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਸਰੋਤ ਵਰਤਦੇ ਹੋਏ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਸੇਵਾਵਾਂ ਰਾਹੀਂ ਪ੍ਰਾਪਤ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਜਿਵੇਂ ਸੈਲ ਟਾਵਰ ਅਤੇ Wi-Fi. ਇਹ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਸੇਵਾਵਾਂ ਚਾਲੂ ਅਤੇ ਐਪ ਨੂੰ ਉਹਨਾਂ ਨੂੰ ਵਰਤਣ ਲਈ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਤੇ ਹੋਣੀਆਂ ਚਾਹੀਦੀਆਂ ਹਨ। ਐਪਸ ਇਸਦੀ ਵਰਤੋਂ ਇਹ ਅਨੁਮਾਨ ਲਗਾਉਣ ਲਈ ਕਰ ਸਕਦੇ ਹਨ ਕਿ ਤੁਸੀਂ ਕਿੱਥੇ ਹੋ।"</string> <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"ਆਪਣੀਆਂ ਔਡੀਓ ਸੈਟਿੰਗਾਂ ਬਦਲੋ"</string> - <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"ਔਪ ਨੂੰ ਗਲੋਬਲ ਔਡੀਓ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ ਜਿਵੇਂ ਵੌਲਯੂਮ ਅਤੇ ਆਊਟਪੁਟ ਲਈ ਕਿਹੜਾ ਸਪੀਕਰ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ।"</string> + <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"ਔਪ ਨੂੰ ਗਲੋਬਲ ਔਡੀਓ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ ਜਿਵੇਂ ਵੌਲਿਊਮ ਅਤੇ ਆਊਟਪੁਟ ਲਈ ਕਿਹੜਾ ਸਪੀਕਰ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ।"</string> <string name="permlab_recordAudio" msgid="3876049771427466323">"ਔਡੀਓ ਰਿਕਾਰਡ ਕਰੋ"</string> <string name="permdesc_recordAudio" msgid="4906839301087980680">"ਐਪ ਨੂੰ ਮਾਈਕ੍ਰੋਫੋਨ ਨਾਲ ਔਡੀਓ ਰਿਕਾਰਡ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ। ਇਹ ਅਨੁਮਤੀ ਐਪ ਨੂੰ ਤੁਹਾਡੀ ਪੁਸ਼ਟੀ ਤੋਂ ਬਿਨਾਂ ਕਿਸੇ ਵੀ ਸਮੇਂ ਔਡੀਓ ਰਿਕਾਰਡ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦੀ ਹੈ।"</string> <string name="permlab_sim_communication" msgid="2935852302216852065">"SIM ਨੂੰ ਕਮਾਂਡਾਂ ਭੇਜੋ"</string> @@ -891,6 +891,38 @@ <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ਸਾਲ ਵਿੱਚ</item> <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ਸਾਲ ਵਿੱਚ</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ਮਿੰਟ ਪਹਿਲਾਂ</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ਮਿੰਟ ਪਹਿਲਾਂ</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ਘੰਟੇ ਪਹਿਲਾਂ</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ਘੰਟੇ ਪਹਿਲਾਂ</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ਦਿਨ ਪਹਿਲਾਂ</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ਦਿਨ ਪਹਿਲਾਂ</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ਸਾਲ ਪਹਿਲਾਂ</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ਸਾਲ ਪਹਿਲਾਂ</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ਮਿੰਟ ਵਿੱਚ</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ਮਿੰਟ ਵਿੱਚ</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ਘੰਟੇ ਵਿੱਚ</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ਘੰਟੇ ਵਿੱਚ</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ਦਿਨ ਵਿੱਚ</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ਦਿਨ ਵਿੱਚ</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ਸਾਲ ਵਿੱਚ</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ਸਾਲ ਵਿੱਚ</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"ਵੀਡੀਓ ਸਮੱਸਿਆ"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"ਇਹ ਵੀਡੀਓ ਇਸ ਡੀਵਾਈਸ ਤੇ ਸਟ੍ਰੀਮਿੰਗ ਲਈ ਪ੍ਰਮਾਣਿਕ ਨਹੀਂ ਹੈ।"</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"ਇਹ ਵੀਡੀਓ ਪਲੇ ਨਹੀਂ ਕਰ ਸਕਦਾ।"</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> ਰੁਕ ਗਿਆ ਹੈ"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> ਵਾਰ-ਵਾਰ ਰੁਕ ਰਹੀ ਹੈ"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> ਵਾਰ-ਵਾਰ ਰੁਕ ਰਹੀ ਹੈ"</string> - <string name="aerr_restart" msgid="9001379185665886595">"ਐਪ ਨੂੰ ਮੁੜ-ਚਾਲੂ ਕਰੋ"</string> - <string name="aerr_reset" msgid="7645427603514220451">"ਐਪ ਨੂੰ ਰੀਸੈੱਟ ਅਤੇ ਮੁੜ-ਚਾਲੂ ਕਰੋ"</string> + <string name="aerr_restart" msgid="7581308074153624475">"ਦੁਬਾਰਾ ਐਪ ਖੋਲ੍ਹੋ"</string> <string name="aerr_report" msgid="5371800241488400617">"ਪ੍ਰਤੀਕਰਮ ਭੇਜੋ"</string> <string name="aerr_close" msgid="2991640326563991340">"ਬੰਦ ਕਰੋ"</string> <string name="aerr_mute" msgid="1974781923723235953">"ਡੀਵਾਈਸ ਦੇ ਮੁੜ-ਚਾਲੂ ਹੋਣ ਤੱਕ ਮਿਊਟ ਕਰੋ"</string> @@ -1008,20 +1039,20 @@ <string name="dump_heap_title" msgid="5864292264307651673">"ਕੀ ਹੀਪ ਡੰਪ ਸ਼ੇਅਰ ਕਰਨਾ ਹੈ?"</string> <string name="dump_heap_text" msgid="4809417337240334941">"ਪ੍ਰਕਿਰਿਆ <xliff:g id="PROC">%1$s</xliff:g> ਦੀ ਆਪਣੀ ਪ੍ਰਕਿਰਿਆ ਮੈਮਰੀ ਸੀਮਾ<xliff:g id="SIZE">%2$s</xliff:g> ਵਧ ਗਈ ਹੈ। ਇਸਦੇ ਵਿਕਾਸਕਾਰ ਨਾਲ ਸ਼ੇਅਰ ਕਰਨ ਲਈ ਤੁਹਾਡੇ ਲਈ ਇੱਕ ਹੀਪ ਡੰਪ ਉਪਲਬਧ ਹੈ। ਸਾਵਧਾਨ ਰਹੋ: ਇਸ ਹੀਪ ਡੰਪ ਵਿੱਚ ਤੁਹਾਡੀ ਕੋਈ ਵੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਹੋ ਸਕਦੀ ਹੈ, ਜਿਸਤੇ ਐਪਲੀਕੇਸ਼ਨ ਦੀ ਪਹੁੰਚ ਹੈ।"</string> <string name="sendText" msgid="5209874571959469142">"ਟੈਕਸਟ ਲਈ ਇੱਕ ਕਿਰਿਆ ਚੁਣੋ"</string> - <string name="volume_ringtone" msgid="6885421406845734650">"ਰਿੰਗਰ ਵੌਲਯੂਮ"</string> - <string name="volume_music" msgid="5421651157138628171">"ਮੀਡੀਆ ਵੌਲਯੂਮ"</string> + <string name="volume_ringtone" msgid="6885421406845734650">"ਰਿੰਗਰ ਵੌਲਿਊਮ"</string> + <string name="volume_music" msgid="5421651157138628171">"ਮੀਡੀਆ ਵੌਲਿਊਮ"</string> <string name="volume_music_hint_playing_through_bluetooth" msgid="9165984379394601533">"Bluetooth ਰਾਹੀਂ ਪਲੇ ਕਰ ਰਿਹਾ ਹੈ"</string> - <string name="volume_music_hint_silent_ringtone_selected" msgid="8310739960973156272">"ਸਾਈਲੈਂਟ ਰਿੰਗਟੋਨ ਸੈਟ ਕੀਤੀ"</string> - <string name="volume_call" msgid="3941680041282788711">"ਇਨ-ਕਾਲ ਵੌਲਯੂਮ"</string> - <string name="volume_bluetooth_call" msgid="2002891926351151534">"Bluetooth ਇਨ-ਕਾਲ ਵੌਲਯੂਮ"</string> - <string name="volume_alarm" msgid="1985191616042689100">"ਅਲਾਰਮ ਵੌਲਯੂਮ"</string> - <string name="volume_notification" msgid="2422265656744276715">"ਸੂਚਨਾ ਵੌਲਯੂਮ"</string> - <string name="volume_unknown" msgid="1400219669770445902">"ਵੌਲਯੂਮ"</string> - <string name="volume_icon_description_bluetooth" msgid="6538894177255964340">"Bluetooth ਵੌਲਯੂਮ"</string> - <string name="volume_icon_description_ringer" msgid="3326003847006162496">"ਰਿੰਗਟੋਨ ਵੌਲਯੂਮ"</string> - <string name="volume_icon_description_incall" msgid="8890073218154543397">"ਕਾਲ ਵੌਲਯੂਮ"</string> - <string name="volume_icon_description_media" msgid="4217311719665194215">"ਮੀਡੀਆ ਵੌਲਯੂਮ"</string> - <string name="volume_icon_description_notification" msgid="7044986546477282274">"ਸੂਚਨਾ ਵੌਲਯੂਮ"</string> + <string name="volume_music_hint_silent_ringtone_selected" msgid="8310739960973156272">"ਖਾਮੋਸ਼ ਰਿੰਗਟੋਨ ਸੈੱਟ ਕੀਤੀ"</string> + <string name="volume_call" msgid="3941680041282788711">"ਇਨ-ਕਾਲ ਵੌਲਿਊਮ"</string> + <string name="volume_bluetooth_call" msgid="2002891926351151534">"Bluetooth ਇਨ-ਕਾਲ ਵੌਲਿਊਮ"</string> + <string name="volume_alarm" msgid="1985191616042689100">"ਅਲਾਰਮ ਵੌਲਿਊਮ"</string> + <string name="volume_notification" msgid="2422265656744276715">"ਸੂਚਨਾ ਵੌਲਿਊਮ"</string> + <string name="volume_unknown" msgid="1400219669770445902">"ਵੌਲਿਊਮ"</string> + <string name="volume_icon_description_bluetooth" msgid="6538894177255964340">"Bluetooth ਵੌਲਿਊਮ"</string> + <string name="volume_icon_description_ringer" msgid="3326003847006162496">"ਰਿੰਗਟੋਨ ਵੌਲਿਊਮ"</string> + <string name="volume_icon_description_incall" msgid="8890073218154543397">"ਕਾਲ ਵੌਲਿਊਮ"</string> + <string name="volume_icon_description_media" msgid="4217311719665194215">"ਮੀਡੀਆ ਵੌਲਿਊਮ"</string> + <string name="volume_icon_description_notification" msgid="7044986546477282274">"ਸੂਚਨਾ ਵੌਲਿਊਮ"</string> <string name="ringtone_default" msgid="3789758980357696936">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਰਿੰਗਟੋਨ"</string> <string name="ringtone_default_with_actual" msgid="8129563480895990372">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਰਿੰਗਟੋਨ (<xliff:g id="ACTUAL_RINGTONE">%1$s</xliff:g>)"</string> <string name="ringtone_silent" msgid="7937634392408977062">"ਕੋਈ ਨਹੀਂ"</string> @@ -1285,7 +1316,7 @@ <string name="storage_usb_drive_label" msgid="4501418548927759953">"<xliff:g id="MANUFACTURER">%s</xliff:g> USB ਡ੍ਰਾਇਵ"</string> <string name="storage_usb" msgid="3017954059538517278">"USB ਸਟੋਰੇਜ"</string> <string name="extract_edit_menu_button" msgid="8940478730496610137">"ਸੰਪਾਦਿਤ ਕਰੋ"</string> - <string name="data_usage_warning_title" msgid="1955638862122232342">"ਡੈਟਾ ਵਰਤੋਂ ਚਿਤਾਵਨੀ"</string> + <string name="data_usage_warning_title" msgid="1955638862122232342">"ਡੈਟਾ ਉਪਯੋਗ ਚਿਤਾਵਨੀ"</string> <string name="data_usage_warning_body" msgid="6660692274311972007">"ਵਰਤੋਂ ਅਤੇ ਸੈਟਿੰਗਾਂ ਨੂੰ ਵੇਖਣ ਲਈ ਟੈਪ ਕਰੋ।"</string> <string name="data_usage_3g_limit_title" msgid="4361523876818447683">"2G-3G ਡੈਟਾ ਸੀਮਾ ਪੂਰੀ ਹੋ ਗਈ"</string> <string name="data_usage_4g_limit_title" msgid="4609566827219442376">"4G ਡੈਟਾ ਸੀਮਾ ਪੂਰੀ ਹੋਈ"</string> @@ -1387,7 +1418,7 @@ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"ਤੁਸੀਂ <xliff:g id="NUMBER_0">%1$d</xliff:g> ਵਾਰ ਆਪਣਾ ਅਨਲੌਕ ਪੈਟਰਨ ਗ਼ਲਤ ਢੰਗ ਨਾਲ ਡ੍ਰਾ ਕੀਤਾ ਹੈ। <xliff:g id="NUMBER_1">%2$d</xliff:g> ਹੋਰ ਅਸਫਲ ਕੋਸ਼ਿਸ਼ਾਂ ਤੋਂ ਬਾਅਦ, ਤੁਹਾਨੂੰ ਇੱਕ ਈਮੇਲ ਖਾਤਾ ਵਰਤਦੇ ਹੋਏ ਆਪਣਾ ਫੋਨ ਅਨਲੌਕ ਕਰਨ ਲਈ ਕਿਹਾ ਜਾਏਗਾ।\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> ਸਕਿੰਟਾਂ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string> <string name="kg_text_message_separator" product="default" msgid="4160700433287233771">" — "</string> <string name="kg_reordering_delete_drop_target_text" msgid="7899202978204438708">"ਹਟਾਓ"</string> - <string name="safe_media_volume_warning" product="default" msgid="2276318909314492312">"ਕੀ ਵੌਲਯੂਮ ਸਿਫਾਰਿਸ਼ ਕੀਤੇ ਪੱਧਰ ਤੋਂ ਵਧਾਉਣੀ ਹੈ?\n\nਲੰਮੇ ਸਮੇਂ ਤੱਕ ਉੱਚ ਵੌਲਯੂਮ ਤੇ ਸੁਣਨ ਨਾਲ ਤੁਹਾਡੀ ਸੁਣਨ ਸ਼ਕਤੀ ਨੂੰ ਨੁਕਸਾਨ ਪਹੁੰਚ ਸਕਦਾ ਹੈ।"</string> + <string name="safe_media_volume_warning" product="default" msgid="2276318909314492312">"ਕੀ ਵੌਲਿਊਮ ਸਿਫਾਰਿਸ਼ ਕੀਤੇ ਪੱਧਰ ਤੋਂ ਵਧਾਉਣੀ ਹੈ?\n\nਲੰਮੇ ਸਮੇਂ ਤੱਕ ਉੱਚ ਵੌਲਿਊਮ ਤੇ ਸੁਣਨ ਨਾਲ ਤੁਹਾਡੀ ਸੁਣਨ ਸ਼ਕਤੀ ਨੂੰ ਨੁਕਸਾਨ ਪਹੁੰਚ ਸਕਦਾ ਹੈ।"</string> <string name="continue_to_enable_accessibility" msgid="1626427372316070258">"ਪਹੁੰਚਯੋਗਤਾ ਨੂੰ ਸਮਰੱਥ ਬਣਾਉਣ ਲਈ ਦੋ ਉਂਗਲਾਂ ਨੂੰ ਹੇਠਾਂ ਹੋਲਡ ਕਰਕੇ ਰੱਖੋ।"</string> <string name="accessibility_enabled" msgid="1381972048564547685">"ਪਹੁੰਚਯੋਗਤਾ ਅਸਮਰਥਿਤ।"</string> <string name="enable_accessibility_canceled" msgid="3833923257966635673">"ਪਹੁੰਚਯੋਗਤਾ ਰੱਦ ਕੀਤੀ।"</string> @@ -1515,7 +1546,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> ਹਟਾਇਆ ਗਿਆ"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"ਕੰਮ <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"ਇਸ ਸਕ੍ਰੀਨ ਨੂੰ ਅਨਪਿੰਨ ਕਰਨ ਲਈ, ਸਪਰਸ਼ ਕਰੋ & ਦਬਾਈ ਰੱਖੋ।"</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"ਇਸ ਸਕ੍ਰੀਨ ਨੂੰ ਅਨਪਿੰਨ ਕਰਨ ਲਈ, ਸਪਰਸ਼ ਕਰੋ & ਰੂਪਰੇਖਾ ਨੂੰ ਦਬਾਈ ਰੱਖੋ।"</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"ਐਪ ਪਿੰਨਡ ਹੈ: ਇਸ ਡੀਵਾਈਸ ਤੇ ਅਨਪਿਨ ਕਰਨ ਦੀ ਆਗਿਆ ਨਹੀਂ ਹੈ।"</string> <string name="lock_to_app_start" msgid="6643342070839862795">"ਸਕ੍ਰੀਨ ਪਿੰਨ ਕੀਤੀ"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"ਸਕ੍ਰੀਨ ਅਨਪਿਨ ਕੀਤੀ"</string> @@ -1526,7 +1556,7 @@ <string name="package_updated_device_owner" msgid="8856631322440187071">"ਤੁਹਾਡੇ ਪ੍ਰਸ਼ਾਸਕ ਦੁਆਰਾ ਅਪਡੇਟ ਕੀਤਾ ਗਿਆ"</string> <string name="package_deleted_device_owner" msgid="7650577387493101353">"ਤੁਹਾਡੇ ਪ੍ਰਬੰਧਕ ਵੱਲੋਂ ਮਿਟਾਇਆ ਗਿਆ"</string> <string name="battery_saver_description" msgid="1960431123816253034">"ਬੈਟਰੀ ਸਮਰੱਥਾ ਨੂੰ ਬਿਹਤਰ ਸਹਾਇਤਾ ਕਰਨ ਲਈ, ਬੈਟਰੀ ਸੇਵਰ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਦਾ ਪ੍ਰਦਰਸ਼ਨ ਘਟਾਉਂਦਾ ਹੈ ਅਤੇ ਵਾਈਬ੍ਰੇਸ਼ਨ, ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਸੇਵਾਵਾਂ ਅਤੇ ਜ਼ਿਆਦਾਤਰ ਪਿਛੋਕੜ ਡੈਟਾ ਨੂੰ ਸੀਮਿਤ ਕਰਦਾ ਹੈ। ਈਮੇਲ, ਮੈਸੇਜਿੰਗ ਅਤੇ ਹੋਰ ਐਪਸ, ਜੋ ਸਿੰਕਿੰਗ ਤੇ ਨਿਰਭਰ ਹਨ, ਉਹ ਉਦੋਂ ਤੱਕ ਅਪਡੇਟ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦੇ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਉਹਨਾਂ ਨੂੰ ਖੋਲ੍ਹਦੇ ਨਹੀਂ।\n\nਬੈਟਰੀ ਸੇਵਰ ਆਟੋਮੈਟਿਕਲੀ ਬੰਦ ਹੁੰਦਾ ਹੈ ਜਦੋਂ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਚਾਰਜ ਹੋ ਰਹੀ ਹੁੰਦੀ ਹੈ।"</string> - <string name="data_saver_description" msgid="6015391409098303235">"ਡੈਟਾ ਵਰਤੋਂ ਘਟਾਉਣ ਵਿੱਚ ਮਦਦ ਲਈ, ਡੈਟਾ ਸੇਵਰ ਕੁਝ ਐਪਾਂ ਨੂੰ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਡੈਟਾ ਭੇਜਣ ਜਾਂ ਪ੍ਰਾਪਤ ਕਰਨ ਤੋਂ ਰੋਕਦਾ ਹੈ। ਤੁਹਾਡੇ ਵੱਲੋਂ ਵਰਤਮਾਨ ਤੌਰ \'ਤੇ ਵਰਤੀ ਜਾ ਰਹੀ ਐਪ ਡੈਟੇ \'ਤੇ ਪਹੁੰਚ ਕਰ ਸਕਦੀ ਹੈ, ਪਰ ਉਹ ਇੰਝ ਕਦੇ-ਕਦਾਈਂ ਕਰ ਸਕਦੀ ਹੈ। ਉਦਾਹਰਨ ਲਈ, ਇਸ ਦਾ ਮਤਲਬ ਇਹ ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਚਿਤਰ ਤਦ ਤੱਕ ਨਹੀਂ ਵਿਖਾਏ ਜਾਂਦੇ, ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਉਹਨਾਂ \'ਤੇ ਟੈਪ ਨਹੀਂ ਕਰਦੇ।"</string> + <string name="data_saver_description" msgid="6015391409098303235">"ਡੈਟਾ ਉਪਯੋਗ ਘਟਾਉਣ ਵਿੱਚ ਮਦਦ ਲਈ, ਡੈਟਾ ਸੇਵਰ ਕੁਝ ਐਪਾਂ ਨੂੰ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਡੈਟਾ ਭੇਜਣ ਜਾਂ ਪ੍ਰਾਪਤ ਕਰਨ ਤੋਂ ਰੋਕਦਾ ਹੈ। ਤੁਹਾਡੇ ਵੱਲੋਂ ਵਰਤਮਾਨ ਤੌਰ \'ਤੇ ਵਰਤੀ ਜਾ ਰਹੀ ਐਪ ਡੈਟੇ \'ਤੇ ਪਹੁੰਚ ਕਰ ਸਕਦੀ ਹੈ, ਪਰ ਉਹ ਇੰਝ ਕਦੇ-ਕਦਾਈਂ ਕਰ ਸਕਦੀ ਹੈ। ਉਦਾਹਰਨ ਲਈ, ਇਸ ਦਾ ਮਤਲਬ ਇਹ ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਚਿਤਰ ਤਦ ਤੱਕ ਨਹੀਂ ਵਿਖਾਏ ਜਾਂਦੇ, ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਉਹਨਾਂ \'ਤੇ ਟੈਪ ਨਹੀਂ ਕਰਦੇ।"</string> <string name="data_saver_enable_title" msgid="4674073932722787417">"ਕੀ ਡੈਟਾ ਸੇਵਰ ਚਾਲੂ ਕਰਨਾ ਹੈ?"</string> <string name="data_saver_enable_button" msgid="7147735965247211818">"ਚਾਲੂ ਕਰੋ"</string> <plurals name="zen_mode_duration_minutes_summary" formatted="false" msgid="4367877408072000848"> @@ -1582,6 +1612,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS ਬੇਨਤੀ USSD ਬੇਨਤੀ ਵਿੱਚ ਸੰਸ਼ੋਧਿਤ ਕੀਤੀ ਗਈ ਹੈ।"</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS ਬੇਨਤੀ ਨਵੀਂ SS ਵਿੱਚ ਸੰਸ਼ੋਧਿਤ ਕੀਤੀ ਗਈ ਹੈ।"</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"ਵਿਸਤਾਰ ਬਟਨ"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"ਟੌਗਲ ਵਿਸਤਾਰ"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB ਪੈਰੀਫੈਰਲ ਪੋਰਟ"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB ਪੈਰੀਫੈਰਲ ਪੋਰਟ"</string> @@ -1589,6 +1621,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"ਓਵਰਫਲੋ ਬੰਦ ਕਰੋ"</string> <string name="maximize_button_text" msgid="7543285286182446254">"ਵੱਡਾ ਕਰੋ"</string> <string name="close_button_text" msgid="3937902162644062866">"ਬੰਦ ਕਰੋ"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ਚੁਣਿਆ ਗਿਆ</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ਚੁਣਿਆ ਗਿਆ</item> @@ -1621,4 +1655,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਬਿਨਾਂ ਪਾਬੰਦੀਆਂ ਦੇ ਵਰਤਣ ਲਈ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਕਰੋ"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"ਹੋਰ ਜਾਣਨ ਲਈ ਸਪਰਸ਼ ਕਰੋ।"</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ <xliff:g id="LABEL">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index a44f943093ab..e04965ba5bd7 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -610,7 +610,7 @@ <string name="phoneTypeRadio" msgid="4093738079908667513">"Radio"</string> <string name="phoneTypeTelex" msgid="3367879952476250512">"Teleks"</string> <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY TDD"</string> - <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Służbowa komórka"</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Komórka służb."</string> <string name="phoneTypeWorkPager" msgid="649938731231157056">"Pager służbowy"</string> <string name="phoneTypeAssistant" msgid="5596772636128562884">"Asystent"</string> <string name="phoneTypeMms" msgid="7254492275502768992">"Wiadomość MMS"</string> @@ -921,6 +921,54 @@ <item quantity="other">za <xliff:g id="COUNT_1">%d</xliff:g> roku</item> <item quantity="one">za <xliff:g id="COUNT_0">%d</xliff:g> rok</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> minuty temu</item> + <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> minut temu</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minuty temu</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minutę temu</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> godziny temu</item> + <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> godzin temu</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> godziny temu</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> godzinę temu</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> dni temu</item> + <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> dni temu</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> dnia temu</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> dzień temu</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> lata temu</item> + <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> lat temu</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> roku temu</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> rok temu</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="few">za <xliff:g id="COUNT_1">%d</xliff:g> minuty</item> + <item quantity="many">za <xliff:g id="COUNT_1">%d</xliff:g> minut</item> + <item quantity="other">za <xliff:g id="COUNT_1">%d</xliff:g> minuty</item> + <item quantity="one">za <xliff:g id="COUNT_0">%d</xliff:g> minutę</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="few">za <xliff:g id="COUNT_1">%d</xliff:g> godziny</item> + <item quantity="many">za <xliff:g id="COUNT_1">%d</xliff:g> godzin</item> + <item quantity="other">za <xliff:g id="COUNT_1">%d</xliff:g> godziny</item> + <item quantity="one">za <xliff:g id="COUNT_0">%d</xliff:g> godzinę</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="few">za <xliff:g id="COUNT_1">%d</xliff:g> dni</item> + <item quantity="many">za <xliff:g id="COUNT_1">%d</xliff:g> dni</item> + <item quantity="other">za <xliff:g id="COUNT_1">%d</xliff:g> dnia</item> + <item quantity="one">za <xliff:g id="COUNT_0">%d</xliff:g> dzień</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="few">za <xliff:g id="COUNT_1">%d</xliff:g> lata</item> + <item quantity="many">za <xliff:g id="COUNT_1">%d</xliff:g> lat</item> + <item quantity="other">za <xliff:g id="COUNT_1">%d</xliff:g> roku</item> + <item quantity="one">za <xliff:g id="COUNT_0">%d</xliff:g> rok</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Problem z filmem"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Ten film nie nadaje się do strumieniowego przesyłania do tego urządzenia."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Nie można odtworzyć tego filmu."</string> @@ -992,8 +1040,7 @@ <string name="aerr_process" msgid="6201597323218674729">"Proces <xliff:g id="PROCESS">%1$s</xliff:g> przestał działać"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> wciąż przestaje działać"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"Proces <xliff:g id="PROCESS">%1$s</xliff:g> wciąż przestaje działać"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Uruchom aplikację ponownie"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Zresetuj aplikację i uruchom ją ponownie"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Otwórz aplikację ponownie"</string> <string name="aerr_report" msgid="5371800241488400617">"Prześlij opinię"</string> <string name="aerr_close" msgid="2991640326563991340">"Zamknij"</string> <string name="aerr_mute" msgid="1974781923723235953">"Ignoruj do momentu ponownego uruchomienia urządzenia"</string> @@ -1550,7 +1597,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> usunięte"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> (praca)"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Aby odpiąć ten ekran, naciśnij i przytrzymaj Wstecz."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Aby odpiąć ten ekran, naciśnij i przytrzymaj Przegląd."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Aplikacja jest przypięta. Nie możesz jej odpiąć na tym urządzeniu."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Ekran przypięty"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Ekran odpięty"</string> @@ -1633,6 +1679,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Żądanie SS zostało zmienione na żądanie USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Żądanie SS zostało zmienione na nowe żądanie SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Profil do pracy"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Przycisk rozwijania"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"przełącz rozwijanie"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Port peryferyjny USB na urządzeniu z Androidem"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"Port peryferyjny USB"</string> @@ -1640,6 +1688,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Zamknij rozszerzony pasek"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Maksymalizuj"</string> <string name="close_button_text" msgid="3937902162644062866">"Zamknij"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="few">Wybrano <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="many">Wybrano <xliff:g id="COUNT_1">%1$d</xliff:g></item> @@ -1674,4 +1724,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Aby używać tego urządzenia bez ograniczeń, przywróć ustawienia fabryczne"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Kliknij, by dowiedzieć się więcej."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Wyłączono: <xliff:g id="LABEL">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-pt-rBR/strings.xml b/core/res/res/values-pt-rBR/strings.xml index a99a86fb5c7d..2531e10e16c0 100644 --- a/core/res/res/values-pt-rBR/strings.xml +++ b/core/res/res/values-pt-rBR/strings.xml @@ -891,6 +891,38 @@ <item quantity="one">em <xliff:g id="COUNT_1">%d</xliff:g> a</item> <item quantity="other">em <xliff:g id="COUNT_1">%d</xliff:g> a</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> minutos atrás</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutos atrás</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> horas atrás</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> horas atrás</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> dias atrás</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> dias atrás</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> anos atrás</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> anos atrás</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="one">em <xliff:g id="COUNT_1">%d</xliff:g> minutos</item> + <item quantity="other">em <xliff:g id="COUNT_1">%d</xliff:g> minutos</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="one">em <xliff:g id="COUNT_1">%d</xliff:g> horas</item> + <item quantity="other">em <xliff:g id="COUNT_1">%d</xliff:g> horas</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="one">em <xliff:g id="COUNT_1">%d</xliff:g> dias</item> + <item quantity="other">em <xliff:g id="COUNT_1">%d</xliff:g> dias</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="one">em <xliff:g id="COUNT_1">%d</xliff:g> anos</item> + <item quantity="other">em <xliff:g id="COUNT_1">%d</xliff:g> anos</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Problema com o vídeo"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Este vídeo não é válido para transmissão neste dispositivo."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Não é possível reproduzir este vídeo."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> parou"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> apresenta falhas continuamente"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> apresenta falhas continuamente"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Reiniciar app"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Redefinir e reiniciar app"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Abrir app novamente"</string> <string name="aerr_report" msgid="5371800241488400617">"Enviar feedback"</string> <string name="aerr_close" msgid="2991640326563991340">"Fechar"</string> <string name="aerr_mute" msgid="1974781923723235953">"Desativar até que dispositivo seja reiniciado"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> excluído"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"Trabalho: <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Para liberar esta tela, toque no botão \"Voltar\" e mantenha-o pressionado."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Para liberar esta tela, toque no botão \"Visão geral\" e mantenha-o pressionado."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"O app está fixado. A liberação não é permitida neste dispositivo."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Tela fixada"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Tela liberada"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"A solicitação SS foi modificada para a solicitação USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"A solicitação SS foi modificada para a nova solicitação SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Perfil de trabalho"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Botão \"Expandir\""</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"alternar expansão"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Porta USB periférica Android"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"Porta USB periférica"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Fechar barra flutuante"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Maximizar"</string> <string name="close_button_text" msgid="3937902162644062866">"Fechar"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> selecionados</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> selecionados</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Redefinir para a configuração original para usar este dispositivo sem restrições"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Toque para saber mais."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Widget <xliff:g id="LABEL">%1$s</xliff:g> desativado"</string> </resources> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index c7088ae1a53c..70c09d460393 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -597,14 +597,14 @@ <string name="phoneTypeOther" msgid="1544425847868765990">"Outro"</string> <string name="phoneTypeCallback" msgid="2712175203065678206">"Rechamada"</string> <string name="phoneTypeCar" msgid="8738360689616716982">"Automóvel"</string> - <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Telefone principal da empresa"</string> + <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Princ. da empresa"</string> <string name="phoneTypeIsdn" msgid="8022453193171370337">"RDIS"</string> <string name="phoneTypeMain" msgid="6766137010628326916">"Principal"</string> <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Outro fax"</string> <string name="phoneTypeRadio" msgid="4093738079908667513">"Rádio"</string> <string name="phoneTypeTelex" msgid="3367879952476250512">"Telex"</string> <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY TDD"</string> - <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Telemóvel do emprego"</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Tel. do emprego"</string> <string name="phoneTypeWorkPager" msgid="649938731231157056">"Pager do trabalho"</string> <string name="phoneTypeAssistant" msgid="5596772636128562884">"Assistente"</string> <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string> @@ -891,6 +891,38 @@ <item quantity="other">dentro de <xliff:g id="COUNT_1">%d</xliff:g>a</item> <item quantity="one">dentro de <xliff:g id="COUNT_0">%d</xliff:g>a</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other">há <xliff:g id="COUNT_1">%d</xliff:g> minutos</item> + <item quantity="one">há <xliff:g id="COUNT_0">%d</xliff:g> minuto</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other">há <xliff:g id="COUNT_1">%d</xliff:g> horas</item> + <item quantity="one">há <xliff:g id="COUNT_0">%d</xliff:g> hora</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other">há <xliff:g id="COUNT_1">%d</xliff:g> dias</item> + <item quantity="one">há <xliff:g id="COUNT_0">%d</xliff:g> dia</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other">há <xliff:g id="COUNT_1">%d</xliff:g> anos</item> + <item quantity="one">há <xliff:g id="COUNT_0">%d</xliff:g> ano</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other">dentro de <xliff:g id="COUNT_1">%d</xliff:g> minutos</item> + <item quantity="one">dentro <xliff:g id="COUNT_0">%d</xliff:g> minuto</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other">dentro de <xliff:g id="COUNT_1">%d</xliff:g> horas</item> + <item quantity="one">dentro de <xliff:g id="COUNT_0">%d</xliff:g> hora</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other">dentro de <xliff:g id="COUNT_1">%d</xliff:g> dias</item> + <item quantity="one">dentro de <xliff:g id="COUNT_0">%d</xliff:g> dia</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other">dentro de <xliff:g id="COUNT_1">%d</xliff:g> anos</item> + <item quantity="one">dentro de <xliff:g id="COUNT_0">%d</xliff:g> ano</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Problema com o vídeo"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Este vídeo não é válido para transmissão em fluxo contínuo neste aparelho."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Não é possível reproduzir este vídeo."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> sofreu uma falha de sistema."</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> continua a falhar"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> continua a falhar"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Reiniciar aplicação"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Repor e reiniciar aplicação"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Abrir aplicação novamente"</string> <string name="aerr_report" msgid="5371800241488400617">"Enviar comentários"</string> <string name="aerr_close" msgid="2991640326563991340">"Fechar"</string> <string name="aerr_mute" msgid="1974781923723235953">"Desativar som até o dispositivo reiniciar"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> eliminado"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> de trabalho"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Para soltar este ecrã, toque sem soltar em Anterior."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Para soltar este ecrã, toque sem soltar em Vista geral."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"A aplicação está fixa: não é permitido soltá-la neste dispositivo."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Ecrã fixo"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Ecrã solto"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"O pedido SS foi modificado para um pedido USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"O pedido SS foi modificado para um novo pedido SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Perfil de trabalho"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Botão Expandir"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"ativar/desativar expansão"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Porta periférica USB para Android"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"Porta periférica USB"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Fechar excesso"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Maximizar"</string> <string name="close_button_text" msgid="3937902162644062866">"Fechar"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> selecionados</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> selecionado</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"-<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Repor os dados de fábrica para utilizar o dispositivo sem restrições"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Toque para saber mais."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> desativado"</string> </resources> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index a99a86fb5c7d..2531e10e16c0 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -891,6 +891,38 @@ <item quantity="one">em <xliff:g id="COUNT_1">%d</xliff:g> a</item> <item quantity="other">em <xliff:g id="COUNT_1">%d</xliff:g> a</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> minutos atrás</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutos atrás</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> horas atrás</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> horas atrás</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> dias atrás</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> dias atrás</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> anos atrás</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> anos atrás</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="one">em <xliff:g id="COUNT_1">%d</xliff:g> minutos</item> + <item quantity="other">em <xliff:g id="COUNT_1">%d</xliff:g> minutos</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="one">em <xliff:g id="COUNT_1">%d</xliff:g> horas</item> + <item quantity="other">em <xliff:g id="COUNT_1">%d</xliff:g> horas</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="one">em <xliff:g id="COUNT_1">%d</xliff:g> dias</item> + <item quantity="other">em <xliff:g id="COUNT_1">%d</xliff:g> dias</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="one">em <xliff:g id="COUNT_1">%d</xliff:g> anos</item> + <item quantity="other">em <xliff:g id="COUNT_1">%d</xliff:g> anos</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Problema com o vídeo"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Este vídeo não é válido para transmissão neste dispositivo."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Não é possível reproduzir este vídeo."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> parou"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> apresenta falhas continuamente"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> apresenta falhas continuamente"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Reiniciar app"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Redefinir e reiniciar app"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Abrir app novamente"</string> <string name="aerr_report" msgid="5371800241488400617">"Enviar feedback"</string> <string name="aerr_close" msgid="2991640326563991340">"Fechar"</string> <string name="aerr_mute" msgid="1974781923723235953">"Desativar até que dispositivo seja reiniciado"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> excluído"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"Trabalho: <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Para liberar esta tela, toque no botão \"Voltar\" e mantenha-o pressionado."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Para liberar esta tela, toque no botão \"Visão geral\" e mantenha-o pressionado."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"O app está fixado. A liberação não é permitida neste dispositivo."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Tela fixada"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Tela liberada"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"A solicitação SS foi modificada para a solicitação USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"A solicitação SS foi modificada para a nova solicitação SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Perfil de trabalho"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Botão \"Expandir\""</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"alternar expansão"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Porta USB periférica Android"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"Porta USB periférica"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Fechar barra flutuante"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Maximizar"</string> <string name="close_button_text" msgid="3937902162644062866">"Fechar"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> selecionados</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> selecionados</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Redefinir para a configuração original para usar este dispositivo sem restrições"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Toque para saber mais."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Widget <xliff:g id="LABEL">%1$s</xliff:g> desativado"</string> </resources> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index f28166c8e7a0..58aef52e43c9 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -682,7 +682,7 @@ <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Încercați din nou"</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Încercați din nou"</string> <string name="faceunlock_multiple_failures" msgid="754137583022792429">"S-a depășit numărul maxim de încercări pentru Deblocare facială"</string> - <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Fără SIM."</string> + <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Fără SIM"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Nu există card SIM în computerul tablet PC."</string> <string name="lockscreen_missing_sim_message" product="tv" msgid="1943633865476989599">"Niciun card SIM în televizor."</string> <string name="lockscreen_missing_sim_message" product="default" msgid="2186920585695169078">"Telefonul nu are card SIM."</string> @@ -906,6 +906,46 @@ <item quantity="other">peste <xliff:g id="COUNT_1">%d</xliff:g> de ani</item> <item quantity="one">peste <xliff:g id="COUNT_0">%d</xliff:g> an</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="few">acum <xliff:g id="COUNT_1">%d</xliff:g> minute</item> + <item quantity="other">acum <xliff:g id="COUNT_1">%d</xliff:g> de minute</item> + <item quantity="one">acum <xliff:g id="COUNT_0">%d</xliff:g> minut</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="few">acum <xliff:g id="COUNT_1">%d</xliff:g> ore</item> + <item quantity="other">acum <xliff:g id="COUNT_1">%d</xliff:g> de ore</item> + <item quantity="one">acum <xliff:g id="COUNT_0">%d</xliff:g> oră</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="few">acum <xliff:g id="COUNT_1">%d</xliff:g> zile</item> + <item quantity="other">acum <xliff:g id="COUNT_1">%d</xliff:g> de zile</item> + <item quantity="one">acum <xliff:g id="COUNT_0">%d</xliff:g> zi</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="few">acum <xliff:g id="COUNT_1">%d</xliff:g> ani</item> + <item quantity="other">acum <xliff:g id="COUNT_1">%d</xliff:g> de ani</item> + <item quantity="one">acum <xliff:g id="COUNT_0">%d</xliff:g> an</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="few">peste <xliff:g id="COUNT_1">%d</xliff:g> minute</item> + <item quantity="other">peste <xliff:g id="COUNT_1">%d</xliff:g> de minute</item> + <item quantity="one">peste <xliff:g id="COUNT_0">%d</xliff:g> minut</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="few">peste <xliff:g id="COUNT_1">%d</xliff:g> ore</item> + <item quantity="other">peste <xliff:g id="COUNT_1">%d</xliff:g> de ore</item> + <item quantity="one">peste <xliff:g id="COUNT_0">%d</xliff:g> oră</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="few">peste <xliff:g id="COUNT_1">%d</xliff:g> zile</item> + <item quantity="other">peste <xliff:g id="COUNT_1">%d</xliff:g> de zile</item> + <item quantity="one">peste <xliff:g id="COUNT_0">%d</xliff:g> zi</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="few">peste <xliff:g id="COUNT_1">%d</xliff:g> ani</item> + <item quantity="other">peste <xliff:g id="COUNT_1">%d</xliff:g> de ani</item> + <item quantity="one">peste <xliff:g id="COUNT_0">%d</xliff:g> an</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Problemă video"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Acest fișier video nu este valid pentru a fi transmis în flux către acest dispozitiv."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Nu puteți reda acest videoclip"</string> @@ -977,8 +1017,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> s-a oprit"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> se oprește încontinuu"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> se oprește încontinuu"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Reporniți aplicația"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Resetați și reporniți aplicația"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Deschideți din nou aplicația"</string> <string name="aerr_report" msgid="5371800241488400617">"Trimiteți feedback"</string> <string name="aerr_close" msgid="2991640326563991340">"Închideți"</string> <string name="aerr_mute" msgid="1974781923723235953">"Dezactivați până la repornirea dispozitivului"</string> @@ -1029,7 +1068,7 @@ <string name="volume_music_hint_silent_ringtone_selected" msgid="8310739960973156272">"Ton de apel silențios setat"</string> <string name="volume_call" msgid="3941680041282788711">"Volum apel de intrare"</string> <string name="volume_bluetooth_call" msgid="2002891926351151534">"Volum apel Bluetooth"</string> - <string name="volume_alarm" msgid="1985191616042689100">"Volum alarmă"</string> + <string name="volume_alarm" msgid="1985191616042689100">"Volumul alarmei"</string> <string name="volume_notification" msgid="2422265656744276715">"Volum notificare"</string> <string name="volume_unknown" msgid="1400219669770445902">"Volum"</string> <string name="volume_icon_description_bluetooth" msgid="6538894177255964340">"Volumul Bluetooth"</string> @@ -1203,7 +1242,7 @@ <string name="sync_binding_label" msgid="3687969138375092423">"Sincronizare"</string> <string name="accessibility_binding_label" msgid="4148120742096474641">"Accesibilitate"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Imagine de fundal"</string> - <string name="chooser_wallpaper" msgid="7873476199295190279">"Modificați imaginea de fundal"</string> + <string name="chooser_wallpaper" msgid="7873476199295190279">"Schimbați imaginea de fundal"</string> <string name="notification_listener_binding_label" msgid="2014162835481906429">"Serviciu de citire a notificărilor"</string> <string name="vr_listener_binding_label" msgid="4316591939343607306">"Instrument de ascultare pentru Realitatea virtuală"</string> <string name="condition_provider_service_binding_label" msgid="1321343352906524564">"Furnizor de condiții"</string> @@ -1531,12 +1570,11 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> a fost șters"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> de serviciu"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Pentru a anula fixarea acestui ecran, atingeți lung opțiunea Înapoi."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Pentru a anula fixarea acestui ecran, atingeți lung opțiunea Recente."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Aplicația este fixată: Anularea fixării nu este permisă pe acest dispozitiv."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Ecran fixat"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Fixarea ecranului anulată"</string> <string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Solicită codul PIN înainte de a anula fixarea"</string> - <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Solicită modelul pentru deblocare înainte de a anula fixarea"</string> + <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Solicită mai întâi modelul pentru deblocare"</string> <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Solicită parola înainte de a anula fixarea"</string> <string name="package_installed_device_owner" msgid="8420696545959087545">"Instalat de administrator"</string> <string name="package_updated_device_owner" msgid="8856631322440187071">"Actualizat de un administrator"</string> @@ -1606,6 +1644,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Solicitarea SS este modificată într-o solicitare USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Solicitarea SS este modificată într-o nouă solicitare SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Profil de serviciu"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Butonul de extindere"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"extindeți/restrângeți"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Port USB Android periferic"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"Port USB periferic"</string> @@ -1613,6 +1653,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Închideți meniul suplimentar"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Maximizați"</string> <string name="close_button_text" msgid="3937902162644062866">"Închideți"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> selectate</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> selectate</item> @@ -1646,4 +1688,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Reveniți la setările din fabrică pentru a folosi acest dispozitiv fără restricții"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Atingeți pentru a afla mai multe."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> a fost dezactivat"</string> </resources> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index fce83ced4e07..e65983d35fdb 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -921,6 +921,54 @@ <item quantity="many">через <xliff:g id="COUNT_1">%d</xliff:g> л.</item> <item quantity="other">через <xliff:g id="COUNT_1">%d</xliff:g> г.</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> минуту назад</item> + <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> минуты назад</item> + <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> минут назад</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> минуты назад</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> час назад</item> + <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> часа назад</item> + <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> часов назад</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> часа назад</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> день назад</item> + <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> дня назад</item> + <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> дней назад</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> дня назад</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> год назад</item> + <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> года назад</item> + <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> лет назад</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> года назад</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="one">через <xliff:g id="COUNT_1">%d</xliff:g> минуту</item> + <item quantity="few">через <xliff:g id="COUNT_1">%d</xliff:g> минуты</item> + <item quantity="many">через <xliff:g id="COUNT_1">%d</xliff:g> минут</item> + <item quantity="other">через <xliff:g id="COUNT_1">%d</xliff:g> минуты</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="one">через <xliff:g id="COUNT_1">%d</xliff:g> час</item> + <item quantity="few">через <xliff:g id="COUNT_1">%d</xliff:g> часа</item> + <item quantity="many">через <xliff:g id="COUNT_1">%d</xliff:g> часов</item> + <item quantity="other">через <xliff:g id="COUNT_1">%d</xliff:g> часа</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="one">через <xliff:g id="COUNT_1">%d</xliff:g> день</item> + <item quantity="few">через <xliff:g id="COUNT_1">%d</xliff:g> дня</item> + <item quantity="many">через <xliff:g id="COUNT_1">%d</xliff:g> дней</item> + <item quantity="other">через <xliff:g id="COUNT_1">%d</xliff:g> дня</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="one">через <xliff:g id="COUNT_1">%d</xliff:g> год</item> + <item quantity="few">через <xliff:g id="COUNT_1">%d</xliff:g> года</item> + <item quantity="many">через <xliff:g id="COUNT_1">%d</xliff:g> лет</item> + <item quantity="other">через <xliff:g id="COUNT_1">%d</xliff:g> года</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Ошибка"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Это видео не предназначено для потокового воспроизведения на данном устройстве."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Не удалось воспроизвести видео."</string> @@ -992,8 +1040,7 @@ <string name="aerr_process" msgid="6201597323218674729">"Во время процесса \"<xliff:g id="PROCESS">%1$s</xliff:g>\" произошел сбой"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"В приложении \"<xliff:g id="APPLICATION">%1$s</xliff:g>\" снова произошел сбой"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"В приложении \"<xliff:g id="PROCESS">%1$s</xliff:g>\" снова произошел сбой"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Перезапустить приложение"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Сбросить и перезапустить"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Перезапустить приложение"</string> <string name="aerr_report" msgid="5371800241488400617">"Отправить отзыв"</string> <string name="aerr_close" msgid="2991640326563991340">"Закрыть"</string> <string name="aerr_mute" msgid="1974781923723235953">"Отключить до перезагрузки устройства"</string> @@ -1550,7 +1597,6 @@ <string name="deleted_key" msgid="7659477886625566590">"Цифра <xliff:g id="KEY">%1$s</xliff:g> удалена"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"Рабочий <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Чтобы открепить экран, нажмите и удерживайте кнопку \"Назад\"."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Чтобы открепить экран, нажмите и удерживайте кнопку \"Обзор\"."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Включена блокировка в приложении. Ее отключение запрещено правилами организации."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Блокировка включена"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Блокировка выключена"</string> @@ -1633,6 +1679,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS-запрос преобразован в USSD-запрос."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS-запрос преобразован в новый SS-запрос."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Рабочий профиль"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Кнопка \"Развернуть\""</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"Свернуть или развернуть"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Внешний USB-порт Android"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"Внешний USB-порт"</string> @@ -1640,6 +1688,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Закрыть дополнительное меню"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Развернуть"</string> <string name="close_button_text" msgid="3937902162644062866">"Закрыть"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="one">Выбрано: <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="few">Выбрано: <xliff:g id="COUNT_1">%1$d</xliff:g></item> @@ -1674,4 +1724,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Сброс до заводских настроек для работы без ограничений"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Нажмите, чтобы узнать больше."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Виджет <xliff:g id="LABEL">%1$s</xliff:g> отключен"</string> </resources> diff --git a/core/res/res/values-si-rLK/strings.xml b/core/res/res/values-si-rLK/strings.xml index 17a709c366ef..b3ff46a8c674 100644 --- a/core/res/res/values-si-rLK/strings.xml +++ b/core/res/res/values-si-rLK/strings.xml @@ -893,6 +893,38 @@ <item quantity="one">ව <xliff:g id="COUNT_1">%d</xliff:g>කදී</item> <item quantity="other">ව <xliff:g id="COUNT_1">%d</xliff:g>කදී</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="one">මිනිත්තු <xliff:g id="COUNT_1">%d</xliff:g>කට පෙර</item> + <item quantity="other">මිනිත්තු <xliff:g id="COUNT_1">%d</xliff:g>කට පෙර</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="one">පැය <xliff:g id="COUNT_1">%d</xliff:g>කට පෙර</item> + <item quantity="other">පැය <xliff:g id="COUNT_1">%d</xliff:g>කට පෙර</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="one">දින <xliff:g id="COUNT_1">%d</xliff:g>කට පෙර</item> + <item quantity="other">දින <xliff:g id="COUNT_1">%d</xliff:g>කට පෙර</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="one">වසර <xliff:g id="COUNT_1">%d</xliff:g>කට පෙර</item> + <item quantity="other">වසර <xliff:g id="COUNT_1">%d</xliff:g>කට පෙර</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="one">මිනිත්තු <xliff:g id="COUNT_1">%d</xliff:g>කින්</item> + <item quantity="other">මිනිත්තු <xliff:g id="COUNT_1">%d</xliff:g>කින්</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="one">පැය <xliff:g id="COUNT_1">%d</xliff:g>කින්</item> + <item quantity="other">පැය <xliff:g id="COUNT_1">%d</xliff:g>කින්</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="one">දින <xliff:g id="COUNT_1">%d</xliff:g>කින්</item> + <item quantity="other">දින <xliff:g id="COUNT_1">%d</xliff:g>කින්</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="one">වසර <xliff:g id="COUNT_1">%d</xliff:g>කින්</item> + <item quantity="other">වසර <xliff:g id="COUNT_1">%d</xliff:g>කින්</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"වීඩියෝ ගැටලුව"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"මේ වීඩියෝව මෙම උපාංගයට ප්රවාහනය සඳහා වලංගු නැත."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"මෙම වීඩියෝව ධාවනය කළ නොහැක."</string> @@ -964,8 +996,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> නැවතී ඇත"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> නැවතෙමින් ඇත"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> නැවතෙමින් ඇත"</string> - <string name="aerr_restart" msgid="9001379185665886595">"යෙදුම නැවත ආරම්භ කරන්න"</string> - <string name="aerr_reset" msgid="7645427603514220451">"යෙදුම නැවත සකසා නැවත ආරම්භ කරන්න"</string> + <string name="aerr_restart" msgid="7581308074153624475">"යෙදුම නැවත විවෘත කරන්න"</string> <string name="aerr_report" msgid="5371800241488400617">"ප්රතිපෝෂණය යවන්න"</string> <string name="aerr_close" msgid="2991640326563991340">"වසන්න"</string> <string name="aerr_mute" msgid="1974781923723235953">"උපාංගය නැවත ආරම්භ වන තෙක් නිහඬ කරන්න"</string> @@ -1238,7 +1269,7 @@ <string name="sync_do_nothing" msgid="3743764740430821845">"දැනට කිසිවක් නොකරන්න"</string> <string name="choose_account_label" msgid="5655203089746423927">"ගිණුමක් තෝරන්න"</string> <string name="add_account_label" msgid="2935267344849993553">"ගිණුමක් එකතු කරන්න"</string> - <string name="add_account_button_label" msgid="3611982894853435874">"ගිණුමක් එකතු කරන්න"</string> + <string name="add_account_button_label" msgid="3611982894853435874">"ගිණුමක් එක් කරන්න"</string> <string name="number_picker_increment_button" msgid="2412072272832284313">"වැඩි කරන්න"</string> <string name="number_picker_decrement_button" msgid="476050778386779067">"අඩු කරන්න"</string> <string name="number_picker_increment_scroll_mode" msgid="5259126567490114216">"<xliff:g id="VALUE">%s</xliff:g> ස්පර්ශ කර අල්ලා ගෙන සිටින්න."</string> @@ -1514,7 +1545,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> මකා දමන ලදි"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"වැඩ <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"මෙම තිරය ඇමුණුම් ඉවත් කිරීමට, ස්පර්ශ කර අල්ලා ගෙන සිටින්න."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"මෙම තිරය ඇමුණුම් ඉවත් කිරීමට, දළ විශ්ලේෂණය ස්පර්ශ කර අල්ලා ගෙන සිටින්න."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"යෙදුම අමුණා ඇත: ගැලවීමට මෙම උපාංගය මත ඉඩ දිය නොහැකිය."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"තිරය අගුළු දමා ඇත"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"තිරයේ අගුළු ඇර ඇත"</string> @@ -1581,6 +1611,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS ඉල්ලීම USSD ඉල්ලීම වෙත විකරණය කරන ලදී."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS ඉල්ලීම නව DIAL ඉල්ලීම වෙත විකරණය කරන ලදී."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"කාර්යාල පැතිකඩ"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"දිගහැරීමේ බොත්තම"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"පුළුල් කිරීම ටොගල කරන්න"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB පර්යන්ත තොට"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB පර්යන්ත තොට"</string> @@ -1588,6 +1620,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"ඉතිරී යාම වසන්න"</string> <string name="maximize_button_text" msgid="7543285286182446254">"විහිදන්න"</string> <string name="close_button_text" msgid="3937902162644062866">"වසන්න"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ක් තෝරන ලදි</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ක් තෝරන ලදි</item> @@ -1620,4 +1654,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"සීමා කිරීම්වලින් තොරව මෙම උපාංගය භාවිත කිරීමට කර්මාන්ත ශාලා යළි සැකසීම"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"තව දැන ගැනීමට ස්පර්ශ කරන්න."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"අබල කළ <xliff:g id="LABEL">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index cac680e9893f..6cc715e54f5e 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -679,7 +679,7 @@ <string name="lockscreen_instructions_when_pattern_enabled" msgid="46154051614126049">"Ak chcete odomknúť telefón alebo uskutočniť tiesňové volanie, stlačte Menu."</string> <string name="lockscreen_instructions_when_pattern_disabled" msgid="686260028797158364">"Telefón odomknete stlačením tlačidla Menu."</string> <string name="lockscreen_pattern_instructions" msgid="7478703254964810302">"Odomknite nakreslením vzoru"</string> - <string name="lockscreen_emergency_call" msgid="5298642613417801888">"Tiesňové volanie"</string> + <string name="lockscreen_emergency_call" msgid="5298642613417801888">"Stav tiesne"</string> <string name="lockscreen_return_to_call" msgid="5244259785500040021">"Zavolať späť"</string> <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Správne!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Skúsiť znova"</string> @@ -921,6 +921,54 @@ <item quantity="other">o <xliff:g id="COUNT_1">%d</xliff:g> r.</item> <item quantity="one">o <xliff:g id="COUNT_0">%d</xliff:g> r.</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="few">pred <xliff:g id="COUNT_1">%d</xliff:g> minútami</item> + <item quantity="many">pred <xliff:g id="COUNT_1">%d</xliff:g> minútou</item> + <item quantity="other">pred <xliff:g id="COUNT_1">%d</xliff:g> minútami</item> + <item quantity="one">pred <xliff:g id="COUNT_0">%d</xliff:g> minútou</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="few">pred <xliff:g id="COUNT_1">%d</xliff:g> hodinami</item> + <item quantity="many">pred <xliff:g id="COUNT_1">%d</xliff:g> hodinou</item> + <item quantity="other">pred <xliff:g id="COUNT_1">%d</xliff:g> hodinami</item> + <item quantity="one">pred <xliff:g id="COUNT_0">%d</xliff:g> hodinou</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="few">pred <xliff:g id="COUNT_1">%d</xliff:g> dňami</item> + <item quantity="many">pred <xliff:g id="COUNT_1">%d</xliff:g> dňom</item> + <item quantity="other">pred <xliff:g id="COUNT_1">%d</xliff:g> dňami</item> + <item quantity="one">pred <xliff:g id="COUNT_0">%d</xliff:g> dňom</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="few">pred <xliff:g id="COUNT_1">%d</xliff:g> rokmi</item> + <item quantity="many">pred <xliff:g id="COUNT_1">%d</xliff:g> rokom</item> + <item quantity="other">pred <xliff:g id="COUNT_1">%d</xliff:g> rokmi</item> + <item quantity="one">pred <xliff:g id="COUNT_0">%d</xliff:g> rokom</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="few">o <xliff:g id="COUNT_1">%d</xliff:g> minúty</item> + <item quantity="many">o <xliff:g id="COUNT_1">%d</xliff:g> minúty</item> + <item quantity="other">o <xliff:g id="COUNT_1">%d</xliff:g> minút</item> + <item quantity="one">o <xliff:g id="COUNT_0">%d</xliff:g> minútu</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="few">o <xliff:g id="COUNT_1">%d</xliff:g> hodiny</item> + <item quantity="many">o <xliff:g id="COUNT_1">%d</xliff:g> hodiny</item> + <item quantity="other">o <xliff:g id="COUNT_1">%d</xliff:g> hodín</item> + <item quantity="one">o <xliff:g id="COUNT_0">%d</xliff:g> hodinu</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="few">o <xliff:g id="COUNT_1">%d</xliff:g> dni</item> + <item quantity="many">o <xliff:g id="COUNT_1">%d</xliff:g> dňa</item> + <item quantity="other">o <xliff:g id="COUNT_1">%d</xliff:g> dní</item> + <item quantity="one">o <xliff:g id="COUNT_0">%d</xliff:g> deň</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="few">o <xliff:g id="COUNT_1">%d</xliff:g> roky</item> + <item quantity="many">o <xliff:g id="COUNT_1">%d</xliff:g> roka</item> + <item quantity="other">o <xliff:g id="COUNT_1">%d</xliff:g> rokov</item> + <item quantity="one">o <xliff:g id="COUNT_0">%d</xliff:g> rok</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Problém s videom"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Je nám ľúto, ale toto video sa nedá streamovať do tohto zariadenia."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Toto video nie je možné prehrať."</string> @@ -992,8 +1040,7 @@ <string name="aerr_process" msgid="6201597323218674729">"Proces <xliff:g id="PROCESS">%1$s</xliff:g> sa zastavil"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> sa opakovane zastavuje"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> sa opakovane zastavuje"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Reštartovať aplikáciu"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Resetovať a reštartovať aplikáciu"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Spustiť aplikáciu znova"</string> <string name="aerr_report" msgid="5371800241488400617">"Odoslať spätnú väzbu"</string> <string name="aerr_close" msgid="2991640326563991340">"Zavrieť"</string> <string name="aerr_mute" msgid="1974781923723235953">"Ignorovať do reštartu zariadenia"</string> @@ -1550,7 +1597,6 @@ <string name="deleted_key" msgid="7659477886625566590">"Číslo <xliff:g id="KEY">%1$s</xliff:g> bolo odstránené"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"Práca – <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Ak chcete uvoľniť túto obrazovku, klepnite na tlačidlo Späť a podržte ho."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Ak chcete uvoľniť túto obrazovku, klepnite na tlačidlo Prehľad a podržte ho."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Aplikácia je pripnutá. Uvoľnenie nie je na tomto zariadení povolené."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Obrazovka bola pripnutá"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Obrazovka bola uvoľnená"</string> @@ -1633,6 +1679,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Žiadosť SS bola upravená na žiadosť USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Žiadosť SS bola upravená na novú žiadosť SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Pracovný profil"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Tlačidlo rozbalenia"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"prepnúť rozbalenie"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Port USB pre periférne zariadenia s Androidom"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"Port USB pre periférne zariadenia"</string> @@ -1640,6 +1688,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Zatvoriť rozbaľovaciu ponuku"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Maximalizovať"</string> <string name="close_button_text" msgid="3937902162644062866">"Zavrieť"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="few">Vybrané: <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="many">Vybrané: <xliff:g id="COUNT_1">%1$d</xliff:g></item> @@ -1674,4 +1724,5 @@ <string name="negative_duration" msgid="5688706061127375131">"-<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Ak chcete toto zariadenie používať bez obmedzení, obnovte na ňom továrenské nastavenia"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Klepnutím získate ďalšie informácie."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Deaktivovaná miniaplikácia <xliff:g id="LABEL">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index 84f5ca8e7ffb..2e6dc31e676b 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -535,7 +535,7 @@ <string name="policylab_wipeData" msgid="3910545446758639713">"Brisanje vseh podatkov"</string> <string name="policydesc_wipeData" product="tablet" msgid="4306184096067756876">"Izbris podatkov v tabličnem računalniku brez opozorila s ponastavitvijo na tovarniške nastavitve"</string> <string name="policydesc_wipeData" product="tv" msgid="5816221315214527028">"Brez opozorila izbriše podatke v televizorju, tako da izvede ponastavitev na tovarniške nastavitve."</string> - <string name="policydesc_wipeData" product="default" msgid="5096895604574188391">"Izbris podatkov v telefonu brez opozorila s ponastavitvijo na tovarniške nastavitve"</string> + <string name="policydesc_wipeData" product="default" msgid="5096895604574188391">"Izbris podatkov v telefonu brez opozorila s ponastavitvijo na tovarniške nastavitve."</string> <string name="policylab_wipeData_secondaryUser" msgid="8362863289455531813">"Izbris podatkov uporabnika"</string> <string name="policydesc_wipeData_secondaryUser" product="tablet" msgid="6336255514635308054">"Izbris podatkov uporabnika v tem tabličnem računalniku brez opozorila."</string> <string name="policydesc_wipeData_secondaryUser" product="tv" msgid="2086473496848351810">"Izbris podatkov uporabnika v tem televizorju brez opozorila."</string> @@ -921,6 +921,54 @@ <item quantity="few">čez <xliff:g id="COUNT_1">%d</xliff:g> l</item> <item quantity="other">čez <xliff:g id="COUNT_1">%d</xliff:g> l</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="one">pred <xliff:g id="COUNT_1">%d</xliff:g> minuto</item> + <item quantity="two">pred <xliff:g id="COUNT_1">%d</xliff:g> minutama</item> + <item quantity="few">pred <xliff:g id="COUNT_1">%d</xliff:g> minutami</item> + <item quantity="other">pred <xliff:g id="COUNT_1">%d</xliff:g> minutami</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="one">pred <xliff:g id="COUNT_1">%d</xliff:g> uro</item> + <item quantity="two">pred <xliff:g id="COUNT_1">%d</xliff:g> urama</item> + <item quantity="few">pred <xliff:g id="COUNT_1">%d</xliff:g> urami</item> + <item quantity="other">pred <xliff:g id="COUNT_1">%d</xliff:g> urami</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="one">pred <xliff:g id="COUNT_1">%d</xliff:g> dnevom</item> + <item quantity="two">pred <xliff:g id="COUNT_1">%d</xliff:g> dnevoma</item> + <item quantity="few">pred <xliff:g id="COUNT_1">%d</xliff:g> dnevi</item> + <item quantity="other">pred <xliff:g id="COUNT_1">%d</xliff:g> dnevi</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="one">pred <xliff:g id="COUNT_1">%d</xliff:g> letom</item> + <item quantity="two">pred <xliff:g id="COUNT_1">%d</xliff:g> letoma</item> + <item quantity="few">pred <xliff:g id="COUNT_1">%d</xliff:g> leti</item> + <item quantity="other">pred <xliff:g id="COUNT_1">%d</xliff:g> leti</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="one">čez <xliff:g id="COUNT_1">%d</xliff:g> minuto</item> + <item quantity="two">čez <xliff:g id="COUNT_1">%d</xliff:g> minuti</item> + <item quantity="few">čez <xliff:g id="COUNT_1">%d</xliff:g> minute</item> + <item quantity="other">čez <xliff:g id="COUNT_1">%d</xliff:g> minut</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="one">čez <xliff:g id="COUNT_1">%d</xliff:g> uro</item> + <item quantity="two">čez <xliff:g id="COUNT_1">%d</xliff:g> uri</item> + <item quantity="few">čez <xliff:g id="COUNT_1">%d</xliff:g> ure</item> + <item quantity="other">čez <xliff:g id="COUNT_1">%d</xliff:g> ur</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="one">čez <xliff:g id="COUNT_1">%d</xliff:g> dan</item> + <item quantity="two">čez <xliff:g id="COUNT_1">%d</xliff:g> dneva</item> + <item quantity="few">čez <xliff:g id="COUNT_1">%d</xliff:g> dni</item> + <item quantity="other">čez <xliff:g id="COUNT_1">%d</xliff:g> dni</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="one">čez <xliff:g id="COUNT_1">%d</xliff:g> leto</item> + <item quantity="two">čez <xliff:g id="COUNT_1">%d</xliff:g> leti</item> + <item quantity="few">čez <xliff:g id="COUNT_1">%d</xliff:g> leta</item> + <item quantity="other">čez <xliff:g id="COUNT_1">%d</xliff:g> let</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Težava z videoposnetkom"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Ta videoposnetek ni veljaven za pretakanje v to napravo."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Tega videoposnetka ni mogoče predvajati."</string> @@ -992,8 +1040,7 @@ <string name="aerr_process" msgid="6201597323218674729">"Proces <xliff:g id="PROCESS">%1$s</xliff:g> se je ustavil"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"Aplikacija <xliff:g id="APPLICATION">%1$s</xliff:g> se stalno ustavlja"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"Proces <xliff:g id="PROCESS">%1$s</xliff:g> se stalno ustavlja"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Vnovični zagon aplikacije"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Ponastavitev in vnovični zagon aplikacije"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Znova odpri aplikacijo"</string> <string name="aerr_report" msgid="5371800241488400617">"Pošlji povratne informacije"</string> <string name="aerr_close" msgid="2991640326563991340">"Zapri"</string> <string name="aerr_mute" msgid="1974781923723235953">"Prezri do vnovičnega zagona naprave"</string> @@ -1550,7 +1597,6 @@ <string name="deleted_key" msgid="7659477886625566590">"Številka <xliff:g id="KEY">%1$s</xliff:g> je izbrisana"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> za delo"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Če želite odpeti ta zaslon, se dotaknite tipke za nazaj in jo pridržite."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Če želite odpeti ta zaslon, se dotaknite tipke za pregled in jo pridržite."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Aplikacija je pripeta: v tej napravi odpenjanje ni dovoljeno."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Zaslon je pripet"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Zaslon je odpet"</string> @@ -1633,6 +1679,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Zahteva SS je spremenjena v zahtevo USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Zahteva SS je spremenjena v novo zahtevo SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Delovni profil"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Gumb za razširitev"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"preklop razširitve"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Vrata USB za dodatno opremo za Android"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"Vrata USB za dodatno opremo"</string> @@ -1640,6 +1688,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Zapri presežni element"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Maksimiziraj"</string> <string name="close_button_text" msgid="3937902162644062866">"Zapri"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> izbran</item> <item quantity="two"><xliff:g id="COUNT_1">%1$d</xliff:g> izbrana</item> @@ -1674,4 +1724,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Ponastavitev naprave na tovarniške nastavitve za uporabo brez omejitev"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Dotaknite se, če želite izvedeti več."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> – onemogočeno"</string> </resources> diff --git a/core/res/res/values-sq-rAL/strings.xml b/core/res/res/values-sq-rAL/strings.xml index 52ddeb04b74b..09304c5d85d1 100644 --- a/core/res/res/values-sq-rAL/strings.xml +++ b/core/res/res/values-sq-rAL/strings.xml @@ -247,7 +247,7 @@ <string name="permgrouplab_location" msgid="7275582855722310164">"Vendndodhja"</string> <string name="permgroupdesc_location" msgid="1346617465127855033">"qasjen te vendndodhja e kësaj pajisjeje"</string> <string name="permgrouplab_calendar" msgid="5863508437783683902">"Kalendari"</string> - <string name="permgroupdesc_calendar" msgid="3889615280211184106">"qasu te kalendari yt"</string> + <string name="permgroupdesc_calendar" msgid="3889615280211184106">"qasje te kalendari yt"</string> <string name="permgrouplab_sms" msgid="228308803364967808">"SMS"</string> <string name="permgroupdesc_sms" msgid="4656988620100940350">"dërgo dhe shiko mesazhet SMS"</string> <string name="permgrouplab_storage" msgid="1971118770546336966">"Hapësira e ruajtjes"</string> @@ -891,6 +891,38 @@ <item quantity="other">në <xliff:g id="COUNT_1">%d</xliff:g> vite</item> <item quantity="one">në <xliff:g id="COUNT_0">%d</xliff:g> vit</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minuta më parë</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minutë më parë</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> orë më parë</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> orë më parë</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ditë më parë</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ditë më parë</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> vite më parë</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> vit më parë</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other">për <xliff:g id="COUNT_1">%d</xliff:g> minuta</item> + <item quantity="one">për <xliff:g id="COUNT_0">%d</xliff:g> minutë</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other">për <xliff:g id="COUNT_1">%d</xliff:g> orë</item> + <item quantity="one">për <xliff:g id="COUNT_0">%d</xliff:g> orë</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other">për <xliff:g id="COUNT_1">%d</xliff:g> ditë</item> + <item quantity="one">për <xliff:g id="COUNT_0">%d</xliff:g> ditë</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other">për <xliff:g id="COUNT_1">%d</xliff:g> vite</item> + <item quantity="one">për <xliff:g id="COUNT_0">%d</xliff:g> vit</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Problem me videon"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Kjo video nuk ofrohet për transmetim në këtë pajisje."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Videoja nuk mund të luhet."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> ka ndaluar"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> vazhdon të ndalojë"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> vazhdon të ndalojë"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Rinis aplikacionin"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Rivendos dhe rinis aplikacionin"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Hap përsëri aplikacionin"</string> <string name="aerr_report" msgid="5371800241488400617">"Dërgo komentin"</string> <string name="aerr_close" msgid="2991640326563991340">"Mbyll"</string> <string name="aerr_mute" msgid="1974781923723235953">"Vendose në heshtje deri kur të riniset pajisja"</string> @@ -1515,7 +1546,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> u fshi"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"Puna <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Për të hequr gozhdimin e ekranit, prek dhe mbaj të shtypur \"Prapa\"."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Për të hequr gozhdimin e ekranit, prek dhe mbaj të shtypur \"Përmbledhja\"."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Ekrani është i gozhduar. Anulimi i mbërthimit nuk lejohet nga organizata jote."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Ekrani u gozhdua"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Ekrani u hoq nga gozhdimi"</string> @@ -1582,6 +1612,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Kërkesa SS është modifikuar në kërkesën USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Kërkesa SS është e modifikuar në kërkesën e re SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Profili i punës"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Butoni i zgjerimit"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"aktivizo zgjerimin"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Porta periferike USB e Androidit"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"Porta periferike USB"</string> @@ -1589,6 +1621,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Mbylle tejkalimin"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Maksimizo"</string> <string name="close_button_text" msgid="3937902162644062866">"Mbyll"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> të zgjedhura</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> i zgjedhur</item> @@ -1621,4 +1655,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Rivendos cilësimet e fabrikës për ta përdorur këtë pajisje pa kufizime"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Prek për të mësuar më shumë."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> u çaktivizua"</string> </resources> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index becd3c8cf28c..c0d875d9c49a 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -607,7 +607,7 @@ <string name="phoneTypeRadio" msgid="4093738079908667513">"Радио"</string> <string name="phoneTypeTelex" msgid="3367879952476250512">"Телекс"</string> <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY TDD"</string> - <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Број пословног мобилног телефона"</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Пословни мобилни"</string> <string name="phoneTypeWorkPager" msgid="649938731231157056">"Пословни пејџер"</string> <string name="phoneTypeAssistant" msgid="5596772636128562884">"Помоћник"</string> <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string> @@ -906,6 +906,46 @@ <item quantity="few">за <xliff:g id="COUNT_1">%d</xliff:g> год</item> <item quantity="other">за <xliff:g id="COUNT_1">%d</xliff:g> год</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="one">пре <xliff:g id="COUNT_1">%d</xliff:g> минута</item> + <item quantity="few">пре <xliff:g id="COUNT_1">%d</xliff:g> минута</item> + <item quantity="other">пре <xliff:g id="COUNT_1">%d</xliff:g> минута</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="one">пре <xliff:g id="COUNT_1">%d</xliff:g> сата</item> + <item quantity="few">пре <xliff:g id="COUNT_1">%d</xliff:g> сата</item> + <item quantity="other">пре <xliff:g id="COUNT_1">%d</xliff:g> сати</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="one">Пре <xliff:g id="COUNT_1">%d</xliff:g> дана</item> + <item quantity="few">Пре <xliff:g id="COUNT_1">%d</xliff:g> дана</item> + <item quantity="other">Пре <xliff:g id="COUNT_1">%d</xliff:g> дана</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="one">пре <xliff:g id="COUNT_1">%d</xliff:g> године</item> + <item quantity="few">пре <xliff:g id="COUNT_1">%d</xliff:g> године</item> + <item quantity="other">пре <xliff:g id="COUNT_1">%d</xliff:g> година</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="one">за <xliff:g id="COUNT_1">%d</xliff:g> минут</item> + <item quantity="few">за <xliff:g id="COUNT_1">%d</xliff:g> минута</item> + <item quantity="other">за <xliff:g id="COUNT_1">%d</xliff:g> минута</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="one">за <xliff:g id="COUNT_1">%d</xliff:g> сат</item> + <item quantity="few">за <xliff:g id="COUNT_1">%d</xliff:g> сата</item> + <item quantity="other">за <xliff:g id="COUNT_1">%d</xliff:g> сати</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="one">за <xliff:g id="COUNT_1">%d</xliff:g> дан</item> + <item quantity="few">за <xliff:g id="COUNT_1">%d</xliff:g> дана</item> + <item quantity="other">за <xliff:g id="COUNT_1">%d</xliff:g> дана</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="one">за <xliff:g id="COUNT_1">%d</xliff:g> годину</item> + <item quantity="few">за <xliff:g id="COUNT_1">%d</xliff:g> године</item> + <item quantity="other">за <xliff:g id="COUNT_1">%d</xliff:g> година</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Проблем са видео снимком"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Овај видео не може да се стримује на овом уређају."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Не можете да пустите овај видео."</string> @@ -977,8 +1017,7 @@ <string name="aerr_process" msgid="6201597323218674729">"Процес <xliff:g id="PROCESS">%1$s</xliff:g> је заустављен"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> се стално зауставља"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"Процес <xliff:g id="PROCESS">%1$s</xliff:g> се стално зауставља"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Поново покрени апликацију"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Ресетуј и поново покрени апликацију"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Поново отвори апликацију"</string> <string name="aerr_report" msgid="5371800241488400617">"Пошаљите повратне информације"</string> <string name="aerr_close" msgid="2991640326563991340">"Затвори"</string> <string name="aerr_mute" msgid="1974781923723235953">"Игнориши док се уређај не покрене поново"</string> @@ -1531,7 +1570,6 @@ <string name="deleted_key" msgid="7659477886625566590">"Избрисали сте <xliff:g id="KEY">%1$s</xliff:g>"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> на послу"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Да бисте откачили овај екран, додирните и задржите Назад."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Да бисте откачили овај екран, додирните и задржите Преглед."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Апликација је закачена: откачињање није дозвољено на овом уређају."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Екран је закачен"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Екран је откачен"</string> @@ -1606,6 +1644,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS захтев је промењен у USSD захтев."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS захтев је промењен у нови SS захтев."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Профил за Work"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Дугме Прошири"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"укључите/искључите проширење"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB порт за периферијске уређаје"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB порт за периферијске уређаје"</string> @@ -1613,6 +1653,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Затвори преклопни мени"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Увећај"</string> <string name="close_button_text" msgid="3937902162644062866">"Затвори"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="one">Изабрана је <xliff:g id="COUNT_1">%1$d</xliff:g> ставка</item> <item quantity="few">Изабране су <xliff:g id="COUNT_1">%1$d</xliff:g> ставке</item> @@ -1646,4 +1688,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Ресетујте уређај на фабричка подешавања да бисте га користили без ограничења"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Додирните да бисте сазнали више."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Виџет <xliff:g id="LABEL">%1$s</xliff:g> је онемогућен"</string> </resources> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index 8add186dc08d..3f06683e7ee0 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -597,15 +597,15 @@ <string name="phoneTypeOther" msgid="1544425847868765990">"Övrigt"</string> <string name="phoneTypeCallback" msgid="2712175203065678206">"Återuppringning"</string> <string name="phoneTypeCar" msgid="8738360689616716982">"Bil"</string> - <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Nummer till företag"</string> + <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Företag (växel)"</string> <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string> <string name="phoneTypeMain" msgid="6766137010628326916">"Telefonnummer"</string> <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Annat faxnummer"</string> <string name="phoneTypeRadio" msgid="4093738079908667513">"Radio"</string> <string name="phoneTypeTelex" msgid="3367879952476250512">"Telex"</string> <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY TDD"</string> - <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Mobiltelefon, arbetet"</string> - <string name="phoneTypeWorkPager" msgid="649938731231157056">"Personsökare, arbetet"</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Jobbmobil"</string> + <string name="phoneTypeWorkPager" msgid="649938731231157056">"Personsökare"</string> <string name="phoneTypeAssistant" msgid="5596772636128562884">"Assistent"</string> <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string> <string name="eventTypeCustom" msgid="7837586198458073404">"Anpassad"</string> @@ -840,7 +840,7 @@ <string name="hours" msgid="894424005266852993">"timmar"</string> <string name="minute" msgid="9148878657703769868">"minut"</string> <string name="minutes" msgid="5646001005827034509">"minuter"</string> - <string name="second" msgid="3184235808021478">"sekunder"</string> + <string name="second" msgid="3184235808021478">"sek."</string> <string name="seconds" msgid="3161515347216589235">"sekunder"</string> <string name="week" msgid="5617961537173061583">"vecka"</string> <string name="weeks" msgid="6509623834583944518">"veckor"</string> @@ -891,6 +891,38 @@ <item quantity="other">om <xliff:g id="COUNT_1">%d</xliff:g> år</item> <item quantity="one">om <xliff:g id="COUNT_0">%d</xliff:g> år</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other">för <xliff:g id="COUNT_1">%d</xliff:g> minuter sedan</item> + <item quantity="one">för <xliff:g id="COUNT_0">%d</xliff:g> minut sedan</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other">för <xliff:g id="COUNT_1">%d</xliff:g> timmar sedan</item> + <item quantity="one">för <xliff:g id="COUNT_0">%d</xliff:g> timme sedan</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other">för <xliff:g id="COUNT_1">%d</xliff:g> dagar sedan</item> + <item quantity="one">för <xliff:g id="COUNT_0">%d</xliff:g> dag sedan</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other">för <xliff:g id="COUNT_1">%d</xliff:g> år sedan</item> + <item quantity="one">för <xliff:g id="COUNT_0">%d</xliff:g> år sedan</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other">om <xliff:g id="COUNT_1">%d</xliff:g> minuter</item> + <item quantity="one">om <xliff:g id="COUNT_0">%d</xliff:g> minut</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other">om <xliff:g id="COUNT_1">%d</xliff:g> timmar</item> + <item quantity="one">om <xliff:g id="COUNT_0">%d</xliff:g> timme</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other">om <xliff:g id="COUNT_1">%d</xliff:g> dagar</item> + <item quantity="one">om <xliff:g id="COUNT_0">%d</xliff:g> dag</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other">om <xliff:g id="COUNT_1">%d</xliff:g> år</item> + <item quantity="one">om <xliff:g id="COUNT_0">%d</xliff:g> år</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Videoproblem"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Videon kan tyvärr inte spelas upp i den här enheten."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Det går inte att spela upp videon."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> har kraschat"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> kraschar gång på gång"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> kraschar gång på gång"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Starta om appen"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Återställ och starta om appen"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Öppna appen igen"</string> <string name="aerr_report" msgid="5371800241488400617">"Skicka feedback"</string> <string name="aerr_close" msgid="2991640326563991340">"Stäng"</string> <string name="aerr_mute" msgid="1974781923723235953">"Ignorera tills enheten har startat om"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> har tagits bort"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> för arbetet"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Om du vill lossa skärmen trycker du länge på Tillbaka."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Om du vill lossa skämen trycker du länge på Översikt."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Appen är fäst. Att lossa den är inte tillåtet på den här enheten."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Skärmen är fäst"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Skärmen är inte längre fäst"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS-begäran har ändrats till en USSD-begäran."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS-begäran har ändrats till en ny SS-begäran."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Jobbprofil"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Knappen Utöka"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"Utöka/komprimera"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"USB-port för Android-kringutrustning"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB-port för kringutrustning"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Dölj utökat verktygsfält"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Maximera"</string> <string name="close_button_text" msgid="3937902162644062866">"Stäng"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> har valts</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> har valts</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"-<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Återställ enheten till standardinställningarna om du vill använda den utan begränsningar"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Tryck här om du vill läsa mer."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> har inaktiverats"</string> </resources> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index e8b863148707..84a94e49cf74 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -245,15 +245,15 @@ <string name="permgrouplab_location" msgid="7275582855722310164">"Mahali"</string> <string name="permgroupdesc_location" msgid="1346617465127855033">"itambue mahali kifaa hiki kilipo"</string> <string name="permgrouplab_calendar" msgid="5863508437783683902">"Kalenda"</string> - <string name="permgroupdesc_calendar" msgid="3889615280211184106">"fikia kalenda yako"</string> + <string name="permgroupdesc_calendar" msgid="3889615280211184106">"ifikie kalenda yako"</string> <string name="permgrouplab_sms" msgid="228308803364967808">"SMS"</string> - <string name="permgroupdesc_sms" msgid="4656988620100940350">"tuma na uangalie ujumbe wa SMS"</string> + <string name="permgroupdesc_sms" msgid="4656988620100940350">"itume na iangalie SMS"</string> <string name="permgrouplab_storage" msgid="1971118770546336966">"Hifadhi"</string> <string name="permgroupdesc_storage" msgid="637758554581589203">"ifikie picha, maudhui na faili kwenye kifaa chako"</string> <string name="permgrouplab_microphone" msgid="171539900250043464">"Kipokea sauti"</string> <string name="permgroupdesc_microphone" msgid="4988812113943554584">"irekodi sauti"</string> <string name="permgrouplab_camera" msgid="4820372495894586615">"Kamera"</string> - <string name="permgroupdesc_camera" msgid="3250611594678347720">"ipiga picha na kurekodi video"</string> + <string name="permgroupdesc_camera" msgid="3250611594678347720">"ipige picha na kurekodi video"</string> <string name="permgrouplab_phone" msgid="5229115638567440675">"Simu"</string> <string name="permgroupdesc_phone" msgid="6234224354060641055">"piga na udhibiti simu"</string> <string name="permgrouplab_sensors" msgid="416037179223226722">"Vihisi vya Mwili"</string> @@ -290,7 +290,7 @@ <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Huruhusu programu kusoma mawasiliano ya matangazo ya simu yaliyoingia kwenye kifaa chako. Arifa za matangazo ya simu huwasilishwa katika maeneo mengine ili kukuonya juu ya hali za dharura. Huenda programu hasidi zikatatiza utendajikazi au shughuli ya kifaa chako wakati matangazo ya simu ya dharura yameingia."</string> <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"kusoma mipasho kutoka vyanzo unavyofuatilia"</string> <string name="permdesc_subscribedFeedsRead" msgid="5557058907906144505">"Inaruhusu programu kupata maelezo kuhusu mlisho iliyolandanishwa kwa sasa."</string> - <string name="permlab_sendSms" msgid="7544599214260982981">"tuma na uangalie ujumbe wa SMS"</string> + <string name="permlab_sendSms" msgid="7544599214260982981">"itume na iangalie SMS"</string> <string name="permdesc_sendSms" msgid="7094729298204937667">"Inaruhusu programu kutuma ujumbe wa SMS. Hii inaweza ikasababisha malipo yasiyotarajiwa. Programu hasidi zinaweza kukugharimu pesa kwa kutuma ujumbe bila uthibitisho wako."</string> <string name="permlab_readSms" msgid="8745086572213270480">"soma SMS au MMS zako"</string> <string name="permdesc_readSms" product="tablet" msgid="2467981548684735522">"Inaruhusu programu kusoma ujumbe wa SMS uliohifadhiwa kwenye kompyuta kibao yako au SIM kadi. Hii inaruhusu programu kusoma ujumbe wote wa SMS, bila kujali maudhui au usiri."</string> @@ -520,8 +520,8 @@ <string name="policydesc_watchLogin_secondaryUser" product="tablet" msgid="4280246270601044505">"Fuatilia idadi ya manenosiri yasiyo sahihi yaliyoingizwa wakati wa kufungua skrini, na ufunge kompyuta kibao au ufute data yote ya mtumiaji huyu kama ameingiza manenosiri yasiyo sahihi mara nyingi kupita kiasi."</string> <string name="policydesc_watchLogin_secondaryUser" product="TV" msgid="3484832653564483250">"Fuatilia idadi ya manenosiri yasiyo sahihi yanayoingizwa wakati wa kufungua skrini, na ufunge televisheni au ufute data yote ya mtumiaji kama ameingiza manenosiri yasiyo sahihi mara nyingi kupita kiasi."</string> <string name="policydesc_watchLogin_secondaryUser" product="default" msgid="2185480427217127147">"Fuatilia idadi ya manenosiri yasiyo sahihi yaliyoingizwa wakati wa kufungua skrini, na ufunge simu au ufute data yote ya mtumiaji huyu kama ameingiza manenosiri yasiyo sahihi mara nyingi kupita kiasi."</string> - <string name="policylab_resetPassword" msgid="4934707632423915395">"Badilisha nenosiri la kufunga skrini"</string> - <string name="policydesc_resetPassword" msgid="1278323891710619128">"Badilisha nenosiri la kufunga skrini."</string> + <string name="policylab_resetPassword" msgid="4934707632423915395">"Kubadilisha nenosiri la kufunga skrini"</string> + <string name="policydesc_resetPassword" msgid="1278323891710619128">"Kubadilisha nenosiri la kufunga skrini."</string> <string name="policylab_forceLock" msgid="2274085384704248431">"Kufunga skrini"</string> <string name="policydesc_forceLock" msgid="1141797588403827138">"Kudhibiti jinsi na wakati skrini inapofunga."</string> <string name="policylab_wipeData" msgid="3910545446758639713">"Kufuta data yote"</string> @@ -598,11 +598,11 @@ <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Simu ya Kampuni"</string> <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string> <string name="phoneTypeMain" msgid="6766137010628326916">"Kuu"</string> - <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Pepesi Nyinginezo"</string> + <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Faksi Nyinginezo"</string> <string name="phoneTypeRadio" msgid="4093738079908667513">"Redio"</string> <string name="phoneTypeTelex" msgid="3367879952476250512">"Teleksi"</string> <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY TDD"</string> - <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Nambari ya Simu ya Mkononi ya Kazini"</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Simu ya Mkononi ya Kazini"</string> <string name="phoneTypeWorkPager" msgid="649938731231157056">"Peja ya Kazini"</string> <string name="phoneTypeAssistant" msgid="5596772636128562884">"Msaidizi"</string> <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string> @@ -889,6 +889,38 @@ <item quantity="other">kwa miaka <xliff:g id="COUNT_1">%d</xliff:g></item> <item quantity="one">kwa maka <xliff:g id="COUNT_0">%d</xliff:g></item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other">Dakika <xliff:g id="COUNT_1">%d</xliff:g> zilizopita</item> + <item quantity="one">Dakika <xliff:g id="COUNT_0">%d</xliff:g> iliyopita</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other">Saa <xliff:g id="COUNT_1">%d</xliff:g> zilizopita</item> + <item quantity="one">Saa <xliff:g id="COUNT_0">%d</xliff:g> iliyopita</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other">Siku <xliff:g id="COUNT_1">%d</xliff:g> zilizopita</item> + <item quantity="one">Siku <xliff:g id="COUNT_0">%d</xliff:g> iliyopita</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other">Miaka <xliff:g id="COUNT_1">%d</xliff:g> iliyopita</item> + <item quantity="one">Mwaka <xliff:g id="COUNT_0">%d</xliff:g> uliopita</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other">baada ya dakika <xliff:g id="COUNT_1">%d</xliff:g></item> + <item quantity="one">baada ya dakika <xliff:g id="COUNT_0">%d</xliff:g></item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other">baada ya saa <xliff:g id="COUNT_1">%d</xliff:g></item> + <item quantity="one">baada ya saa <xliff:g id="COUNT_0">%d</xliff:g></item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other">baada ya siku <xliff:g id="COUNT_1">%d</xliff:g></item> + <item quantity="one">baada ya siku <xliff:g id="COUNT_0">%d</xliff:g></item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other">baada ya miaka <xliff:g id="COUNT_1">%d</xliff:g></item> + <item quantity="one">baada ya mwaka <xliff:g id="COUNT_0">%d</xliff:g></item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Shida ya video"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Video hii si halali kutiririshwa kwa kifaa hiki."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Haiwezi kucheza video hii."</string> @@ -960,8 +992,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> imeacha kufanya kazi"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> inaacha kufanya kazi kila mara"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> inaacha kufanya kazi kila mara"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Anzisha upya programu"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Weka na uanzishe upya programu"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Fungua programu tena"</string> <string name="aerr_report" msgid="5371800241488400617">"Tuma maoni yako"</string> <string name="aerr_close" msgid="2991640326563991340">"Funga"</string> <string name="aerr_mute" msgid="1974781923723235953">"Komesha hadi kifaa kianze upya"</string> @@ -1510,7 +1541,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> kimefutwa"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"Ya kazini <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Ili kubandua skrini hii, gusa na ushikilie Nyuma."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Ili kubandua skrini hii, gusa na ushikile Muhtasari."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Programu imebanwa: Kubanuliwa hakuruhusiwi kwenye kifaa hiki."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Skrini imebandikwa"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Skrini imebanduliwa"</string> @@ -1577,6 +1607,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Ombi la SS limerekebishwa na kuwa ombi la USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Ombi la SS limerekebishwa na kuwa ombi jipya la SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Wasifu wa kazini"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Kitufe cha kupanua"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"geuza upanuzi"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Mlango wa USB wa Pembeni wa Android"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"Mlango wa USB wa Pembeni"</string> @@ -1584,6 +1616,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Funga vipengee vya ziada"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Panua"</string> <string name="close_button_text" msgid="3937902162644062866">"Funga"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> vimechaguliwa</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> kimechaguliwa</item> @@ -1616,4 +1650,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Rejesha mipangilio iliyotoka nayo kiwandani ili utumie kifaa hiki bila vikwazo"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Gusa ili kupata maelezo zaidi."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> imezimwa"</string> </resources> diff --git a/core/res/res/values-ta-rIN/strings.xml b/core/res/res/values-ta-rIN/strings.xml index d5155a108929..291db37c9437 100644 --- a/core/res/res/values-ta-rIN/strings.xml +++ b/core/res/res/values-ta-rIN/strings.xml @@ -891,6 +891,38 @@ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ஆண்டுகளில்</item> <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ஆண்டில்</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> நிமிடங்களுக்கு முன்பு</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> நிமிடத்திற்கு முன்பு</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> மணிநேரத்திற்கு முன்பு</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> மணிநேரத்திற்கு முன்பு</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> நாட்களுக்கு முன்பு</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> நாளுக்கு முன்பு</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ஆண்டுகளுக்கு முன்பு</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ஆண்டிற்கு முன்பு</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g> நிமிடங்களில்</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> நிமிடத்தில்</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> மணிநேரத்தில்</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> மணிநேரத்தில்</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> நாட்களில்</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> நாளில்</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ஆண்டுகளில்</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ஆண்டில்</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"வீடியோவில் சிக்கல்"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"சாதனத்தில் ஸ்ட்ரீம் செய்வதற்கு இது சரியான வீடியோ அல்ல."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"இந்த வீடியோவை இயக்க முடியவில்லை."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> செயலிழந்தது"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> தொடர்ந்து செயலிழக்கிறது"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> தொடர்ந்து செயலிழக்கிறது"</string> - <string name="aerr_restart" msgid="9001379185665886595">"பயன்பாட்டை மீண்டும் தொடங்கு"</string> - <string name="aerr_reset" msgid="7645427603514220451">"பயன்பாட்டை மீட்டமைத்து மீண்டும் தொடங்கு"</string> + <string name="aerr_restart" msgid="7581308074153624475">"பயன்பாட்டை மீண்டும் திற"</string> <string name="aerr_report" msgid="5371800241488400617">"கருத்து தெரிவி"</string> <string name="aerr_close" msgid="2991640326563991340">"மூடு"</string> <string name="aerr_mute" msgid="1974781923723235953">"சாதனம் மீண்டும் தொடங்கும் வரை முடக்கு"</string> @@ -1515,7 +1546,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> நீக்கப்பட்டது"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"பணியிடம் <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"இந்தத் திரையை விலக்க, \"முந்தையது\" பொத்தானைத் தொட்டுப் பிடிக்கவும்."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"இந்தத் திரையை விலக்க, \"மேலோட்டப் பார்வை\" பொத்தானைத் தொட்டுப் பிடிக்கவும்."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"பயன்பாடு பொருத்தப்பட்டது: பொருத்தியதை நீக்குவதற்கு இந்தச் சாதனத்தில் அனுமதியில்லை."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"திரை பின் செய்யப்பட்டது"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"திரையின் பின் அகற்றப்பட்டது"</string> @@ -1582,6 +1612,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS கோரிக்கையானது USSD கோரிக்கைக்கு மாற்றப்பட்டது."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS கோரிக்கையானது புதிய SS கோரிக்கைக்கு மாற்றப்பட்டது."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"பணி சுயவிவரம்"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"விரி பொத்தான்"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"விரிவாக்கத்தை நிலைமாற்றும்"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB பெரிபெரல் போர்ட்"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB பெரிபெரல் போர்ட்"</string> @@ -1589,6 +1621,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"மேல்தோன்றலை மூடு"</string> <string name="maximize_button_text" msgid="7543285286182446254">"பெரிதாக்கு"</string> <string name="close_button_text" msgid="3937902162644062866">"மூடு"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> தேர்ந்தெடுக்கப்பட்டன</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> தேர்ந்தெடுக்கப்பட்டது</item> @@ -1621,4 +1655,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"இந்தச் சாதனத்தைக் கட்டுப்பாடுகளின்றிப் பயன்படுத்த, ஆரம்ப நிலைக்கு மீட்டமைக்கவும்"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"மேலும் அறிய தொடவும்."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"முடக்கப்பட்டது: <xliff:g id="LABEL">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-te-rIN/strings.xml b/core/res/res/values-te-rIN/strings.xml index 56195b7aaaac..7890aa74141b 100644 --- a/core/res/res/values-te-rIN/strings.xml +++ b/core/res/res/values-te-rIN/strings.xml @@ -55,7 +55,7 @@ <string name="mmiComplete" msgid="8232527495411698359">"MMI పూర్తయింది."</string> <string name="badPin" msgid="9015277645546710014">"మీరు టైప్ చేసిన పాత పిన్ చెల్లదు."</string> <string name="badPuk" msgid="5487257647081132201">"మీరు టైప్ చేసిన PUK చెల్లదు."</string> - <string name="mismatchPin" msgid="609379054496863419">"మీరు టైప్ చేసిన PINలు సరిపోలలేదు."</string> + <string name="mismatchPin" msgid="609379054496863419">"మీరు టైప్ చేసిన పిన్లు సరిపోలలేదు."</string> <string name="invalidPin" msgid="3850018445187475377">"4 నుండి 8 సంఖ్యలు ఉండే పిన్ను టైప్ చేయండి."</string> <string name="invalidPuk" msgid="8761456210898036513">"8 సంఖ్యలు లేదా అంతకంటే పొడవు ఉండే PUKని టైప్ చేయండి."</string> <string name="needPuk" msgid="919668385956251611">"మీ సిమ్ కార్డు PUK-లాక్ చేయబడింది. దీన్ని అన్లాక్ చేయడానికి PUK కోడ్ను టైప్ చేయండి."</string> @@ -891,6 +891,38 @@ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> సం.లో</item> <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> సం.లో</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> నిమిషాల క్రితం</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> నిమిషం క్రితం</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> గంటల క్రితం</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> గంట క్రితం</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> రోజుల క్రితం</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> రోజు క్రితం</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> సంవత్సరాల క్రితం</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> సంవత్సరం క్రితం</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> నిమిషాల్లో</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> నిమిషంలో</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> గంటల్లో</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> గంటలో</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> రోజుల్లో</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> రోజులో</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> సంవత్సరాల్లో</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> సంవత్సరంలో</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"వీడియో సమస్య"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"ఈ పరికరంలో ప్రసారం చేయడానికి ఈ వీడియో చెల్లదు."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"ఈ వీడియోను ప్లే చేయడం సాధ్యపడదు."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> ఆపివేయబడింది"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> పునరావృతంగా ఆపివేయబడుతోంది"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> పునరావృతంగా ఆపివేయబడుతోంది"</string> - <string name="aerr_restart" msgid="9001379185665886595">"అనువర్తనాన్ని పునఃప్రారంభించు"</string> - <string name="aerr_reset" msgid="7645427603514220451">"రీసెట్ చేసి, అనువర్తనాన్ని పునఃప్రారంభించు"</string> + <string name="aerr_restart" msgid="7581308074153624475">"అనువర్తనాన్ని మళ్లీ తెరువు"</string> <string name="aerr_report" msgid="5371800241488400617">"అభిప్రాయాన్ని పంపు"</string> <string name="aerr_close" msgid="2991640326563991340">"మూసివేయి"</string> <string name="aerr_mute" msgid="1974781923723235953">"పరికరం పునఃప్రారంభమయ్యే వరకు మ్యూట్ చేయి"</string> @@ -1495,7 +1526,7 @@ <string name="restr_pin_enter_new_pin" msgid="5959606691619959184">"కొత్త పిన్"</string> <string name="restr_pin_confirm_pin" msgid="8501523829633146239">"కొత్త పిన్ను నిర్ధారించండి"</string> <string name="restr_pin_create_pin" msgid="8017600000263450337">"నియంత్రణలను సవరించడానికి పిన్ను రూపొందించండి"</string> - <string name="restr_pin_error_doesnt_match" msgid="2224214190906994548">"PINలు సరిపోలలేదు. మళ్లీ ప్రయత్నించండి."</string> + <string name="restr_pin_error_doesnt_match" msgid="2224214190906994548">"పిన్లు సరిపోలలేదు. మళ్లీ ప్రయత్నించండి."</string> <string name="restr_pin_error_too_short" msgid="8173982756265777792">"పిన్ చాలా చిన్నదిగా ఉంది. తప్పనిసరిగా కనీసం 4 అంకెలు ఉండాలి."</string> <plurals name="restr_pin_countdown" formatted="false" msgid="9061246974881224688"> <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> సెకన్లలో మళ్లీ ప్రయత్నించండి</item> @@ -1515,7 +1546,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> తొలగించబడింది"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"కార్యాలయం <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"ఈ స్క్రీన్ని అన్పిన్ చేయడానికి, వెనుకకు తాకి & అలాగే పట్టుకోండి."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"ఈ స్క్రీన్ని అన్పిన్ చేయడానికి, స్థూల దృష్టిని తాకి & అలాగే పట్టుకోండి."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"అనువర్తనం పిన్ చేయబడింది: ఈ పరికరంలో అన్పిన్ చేయడానికి అనుమతి లేదు."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"స్క్రీన్ పిన్ చేయబడింది"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"స్క్రీన్ అన్పిన్ చేయబడింది"</string> @@ -1582,6 +1612,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS అభ్యర్థన USSD అభ్యర్థనగా సవరించబడింది."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS అభ్యర్థన కొత్త SS అభ్యర్థనగా సవరించబడింది."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"కార్యాలయ ప్రొఫైల్"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"విస్తరింపజేయి బటన్"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"విస్తరణను టోగుల్ చేయండి"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB పెరిఫెరల్ పోర్ట్"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB పెరిఫెరల్ పోర్ట్"</string> @@ -1589,6 +1621,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"అతివ్యాప్తిని మూసివేస్తుంది"</string> <string name="maximize_button_text" msgid="7543285286182446254">"గరిష్టీకరించు"</string> <string name="close_button_text" msgid="3937902162644062866">"మూసివేయి"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ఎంచుకోబడ్డాయి</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ఎంచుకోబడింది</item> @@ -1621,4 +1655,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"ఈ పరికరాన్ని ఎటువంటి పరిమితులు లేకుండా ఉపయోగించడానికి ఫ్యాక్టరీ రీసెట్ చేయండి"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"మరింత తెలుసుకోవడానికి తాకండి."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> నిలిపివేయబడింది"</string> </resources> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index 6415de19ba19..deb9fae977d5 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -604,7 +604,7 @@ <string name="phoneTypeRadio" msgid="4093738079908667513">"วิทยุ"</string> <string name="phoneTypeTelex" msgid="3367879952476250512">"เทเล็กซ์"</string> <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY TDD"</string> - <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"โทรศัพท์มือถือที่ทำงาน"</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"มือถือที่ทำงาน"</string> <string name="phoneTypeWorkPager" msgid="649938731231157056">"เพจเจอร์ที่ทำงาน"</string> <string name="phoneTypeAssistant" msgid="5596772636128562884">"ผู้ช่วย"</string> <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string> @@ -891,6 +891,38 @@ <item quantity="other">ใน <xliff:g id="COUNT_1">%d</xliff:g> ปี</item> <item quantity="one">ใน <xliff:g id="COUNT_0">%d</xliff:g> ปี</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> นาทีที่ผ่านมา</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> นาทีที่ผ่านมา</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ชั่วโมงที่ผ่านมา</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ชั่วโมงที่ผ่านมา</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> วันที่ผ่านมา</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> วันที่ผ่านมา</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ปีที่ผ่านมา</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ปีที่ผ่านมา</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other">ใน <xliff:g id="COUNT_1">%d</xliff:g> นาที</item> + <item quantity="one">ใน <xliff:g id="COUNT_0">%d</xliff:g> นาที</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other">ใน <xliff:g id="COUNT_1">%d</xliff:g> ชั่วโมง</item> + <item quantity="one">ใน <xliff:g id="COUNT_0">%d</xliff:g> ชั่วโมง</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other">ใน <xliff:g id="COUNT_1">%d</xliff:g> วัน</item> + <item quantity="one">ใน <xliff:g id="COUNT_0">%d</xliff:g> วัน</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other">ใน <xliff:g id="COUNT_1">%d</xliff:g> ปี</item> + <item quantity="one">ใน <xliff:g id="COUNT_0">%d</xliff:g> ปี</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"ปัญหาเกี่ยวกับวิดีโอ"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"วิดีโอนี้ไม่สามารถสตรีมไปยังอุปกรณ์นี้"</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"ไม่สามารถเล่นวิดีโอนี้"</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> หยุดทำงาน"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> หยุดทำงานอยู่เรื่อยๆ"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> หยุดทำงานอยู่เรื่อยๆ"</string> - <string name="aerr_restart" msgid="9001379185665886595">"เปิดแอปใหม่"</string> - <string name="aerr_reset" msgid="7645427603514220451">"รีเซ็ตแอปและเปิดใหม่"</string> + <string name="aerr_restart" msgid="7581308074153624475">"เปิดแอปอีกครั้ง"</string> <string name="aerr_report" msgid="5371800241488400617">"ส่งความคิดเห็น"</string> <string name="aerr_close" msgid="2991640326563991340">"ปิด"</string> <string name="aerr_mute" msgid="1974781923723235953">"ปิดการแจ้งเตือนจนกว่าอุปกรณ์จะรีสตาร์ท"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"ลบ <xliff:g id="KEY">%1$s</xliff:g> แล้ว"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g>ที่ทำงาน"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"หากต้องการเลิกตรึงหน้าจอนี้ แตะ \"กลับ\" ค้างไว้"</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"หากต้องการเลิกตรึงหน้าจอนี้ แตะ \"ภาพรวม\" ค้างไว้"</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"มีการตรึงแอป: ไม่อนุญาตให้เลิกตรึงบนอุปกรณ์นี้"</string> <string name="lock_to_app_start" msgid="6643342070839862795">"ตรึงหน้าจอแล้ว"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"เลิกตรึงหน้าจอแล้ว"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"คำขอ SS ได้รับการแก้ไขให้เป็นคำขอ USSD"</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"คำขอ SS ได้รับการแก้ไขให้เป็นคำขอ SS ใหม่"</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"โปรไฟล์งาน"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"ปุ่มขยาย"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"สลับการขยาย"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"อุปกรณ์สำหรับต่อพอร์ต USB ของ Android"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"อุปกรณ์สำหรับต่อพอร์ต USB"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"ปิดรายการเพิ่มเติม"</string> <string name="maximize_button_text" msgid="7543285286182446254">"ขยายใหญ่สุด"</string> <string name="close_button_text" msgid="3937902162644062866">"ปิด"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other">เลือกไว้ <xliff:g id="COUNT_1">%1$d</xliff:g> รายการ</item> <item quantity="one">เลือกไว้ <xliff:g id="COUNT_0">%1$d</xliff:g> รายการ</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"รีเซ็ตเป็นค่าเริ่มต้นเพื่อใช้อุปกรณ์นี้โดยไร้ข้อจำกัด"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"แตะเพื่อเรียนรู้เพิ่มเติม"</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"ปิดใช้ <xliff:g id="LABEL">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index 83885de8438a..65cac8a0b4cf 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -255,7 +255,7 @@ <string name="permgrouplab_microphone" msgid="171539900250043464">"Mikropono"</string> <string name="permgroupdesc_microphone" msgid="4988812113943554584">"mag-record ng audio"</string> <string name="permgrouplab_camera" msgid="4820372495894586615">"Camera"</string> - <string name="permgroupdesc_camera" msgid="3250611594678347720">"kumuha ng mga larawan at nmag-record ng video"</string> + <string name="permgroupdesc_camera" msgid="3250611594678347720">"kumuha ng mga larawan at mag-record ng video"</string> <string name="permgrouplab_phone" msgid="5229115638567440675">"Telepono"</string> <string name="permgroupdesc_phone" msgid="6234224354060641055">"tumatawag sa telepono at namamahala sa mga tawag sa telepono"</string> <string name="permgrouplab_sensors" msgid="416037179223226722">"Mga Sensor ng Katawan"</string> @@ -891,6 +891,38 @@ <item quantity="one">sa loob ng <xliff:g id="COUNT_1">%d</xliff:g>y</item> <item quantity="other">sa loob ng <xliff:g id="COUNT_1">%d</xliff:g>y</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> minuto na ang nakakalipas</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> na minuto na ang nakakalipas</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> oras na ang nakakalipas</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> na oras na ang nakakalipas</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> araw na ang nakakalipas</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> na araw na ang nakakalipas</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> taon na ang nakakalipas</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> na taon na ang nakakalipas</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="one">pagkalipas ng <xliff:g id="COUNT_1">%d</xliff:g> minuto</item> + <item quantity="other">pagkalipas ng <xliff:g id="COUNT_1">%d</xliff:g> na minuto</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="one">pagkalipas ng <xliff:g id="COUNT_1">%d</xliff:g> oras</item> + <item quantity="other">pagkalipas ng <xliff:g id="COUNT_1">%d</xliff:g> na oras</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="one">pagkalipas ng <xliff:g id="COUNT_1">%d</xliff:g> araw</item> + <item quantity="other">pagkalipas ng <xliff:g id="COUNT_1">%d</xliff:g> na araw</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="one">pagkalipas ng <xliff:g id="COUNT_1">%d</xliff:g> taon</item> + <item quantity="other">pagkalipas ng <xliff:g id="COUNT_1">%d</xliff:g> na taon</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Problema sa video"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Hindi wasto ang video na ito para sa streaming sa device na ito."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Hindi ma-play ang video na ito."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"Huminto ang <xliff:g id="PROCESS">%1$s</xliff:g>"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"Paulit-ulit na humihinto ang <xliff:g id="APPLICATION">%1$s</xliff:g>"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"Paulit-ulit na humihinto ang <xliff:g id="PROCESS">%1$s</xliff:g>"</string> - <string name="aerr_restart" msgid="9001379185665886595">"I-restart ang app"</string> - <string name="aerr_reset" msgid="7645427603514220451">"I-reset at i-restart ang app"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Buksang muli ang app"</string> <string name="aerr_report" msgid="5371800241488400617">"Magpadala ng feedback"</string> <string name="aerr_close" msgid="2991640326563991340">"Isara"</string> <string name="aerr_mute" msgid="1974781923723235953">"I-mute hanggang sa mag-restart ang device"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"Tinanggal ang <xliff:g id="KEY">%1$s</xliff:g>"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> sa Trabaho"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Upang i-unpin ang screen na ito, pindutin nang matagal ang Bumalik."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Upang i-unpin ang screen na ito, pindutin nang matagal ang Pangkalahatang-ideya."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Naka-pin ang app: Hindi pinapayagan ang pag-a-unpin sa device na ito."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Naka-pin ang screen"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Naka-unpin ang screen"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Ginawang USSD request ang SS request."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Ginawang bagong SS request ang SS request."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Profile sa trabaho"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Button na Palawakin"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"i-toggle ang pagpapalawak"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB Peripheral Port"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB Peripheral Port"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Isara ang overflow"</string> <string name="maximize_button_text" msgid="7543285286182446254">"I-maximize"</string> <string name="close_button_text" msgid="3937902162644062866">"Isara"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ang napili</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ang napili</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"I-factory reset upang magamit ang device na ito nang walang mga paghihigpit"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Pindutin upang matuto nang higit pa."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Na-disable ang <xliff:g id="LABEL">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index 9dedf1e9daac..59044b9bf8fb 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -891,6 +891,38 @@ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> y içinde</item> <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> y içinde</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> dakika önce</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> dakika önce</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> saat önce</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> saat önce</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> gün önce</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> gün önce</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> yıl önce</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> yıl önce</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> dakika içinde</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> dakika içinde</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> saat içinde</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> saat içinde</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> gün içinde</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> gün içinde</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> yıl içinde</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> yıl içinde</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Video sorunu"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Bu video bu cihazda akış için uygun değil."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Bu video oynatılamıyor."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> durdu"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> sürekli olarak duruyor"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> sürekli olarak duruyor"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Uygulamayı yeniden başlat"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Uygulamayı sıfırla ve yeniden başlat"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Uygulamayı tekrar aç"</string> <string name="aerr_report" msgid="5371800241488400617">"Geri bildirim gönder"</string> <string name="aerr_close" msgid="2991640326563991340">"Kapat"</string> <string name="aerr_mute" msgid="1974781923723235953">"Cihaz yeniden başlatılana kadar bir daha gösterme"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> silindi"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> (İş)"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Bu ekranın sabitlemesini kaldırmak için Geri\'ye dokunup basılı tutun."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Bu ekranın sabitlemesini kaldırmak için Genel Bakış\'a dokunup basılı tutun."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Uygulama sabitlendi. Bu cihazda sabitlemenin kaldırılmasına izin verilmiyor."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Ekran sabitlendi"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Ekran sabitlemesi kaldırıldı"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS isteği USSD isteği olarak değiştirildi."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS isteği yeni SS isteği olarak değiştirildi."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"İş profili"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Genişlet düğmesi"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"genişletmeyi aç/kapat"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB Çevre Birimi Bağlantı Noktası"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB Çevre Birimi Bağlantı Noktası"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Taşan araç çubuğunu kapat"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Ekranı Kapla"</string> <string name="close_button_text" msgid="3937902162644062866">"Kapat"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> öğe seçildi</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> öğe seçildi</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Bu cihazı kısıtlama olmadan kullanmak için fabrika ayarlarına sıfırlayın"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Daha fazla bilgi edinmek için dokunun."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> devre dışı"</string> </resources> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index 1c1547cb01f6..27ad63356246 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -921,6 +921,54 @@ <item quantity="many">через <xliff:g id="COUNT_1">%d</xliff:g> років</item> <item quantity="other">через <xliff:g id="COUNT_1">%d</xliff:g> року</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> хвилину тому</item> + <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> хвилини тому</item> + <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> хвилин тому</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> хвилини тому</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> годину тому</item> + <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> години тому</item> + <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> годин тому</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> години тому</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> день тому</item> + <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> дні тому</item> + <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> днів тому</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> дня тому</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> рік тому</item> + <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> роки тому</item> + <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> років тому</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> року тому</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="one">через <xliff:g id="COUNT_1">%d</xliff:g> хвилину</item> + <item quantity="few">через <xliff:g id="COUNT_1">%d</xliff:g> хвилини</item> + <item quantity="many">через <xliff:g id="COUNT_1">%d</xliff:g> хвилин</item> + <item quantity="other">через <xliff:g id="COUNT_1">%d</xliff:g> хвилини</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="one">через <xliff:g id="COUNT_1">%d</xliff:g> годину</item> + <item quantity="few">через <xliff:g id="COUNT_1">%d</xliff:g> години</item> + <item quantity="many">через <xliff:g id="COUNT_1">%d</xliff:g> годин</item> + <item quantity="other">через <xliff:g id="COUNT_1">%d</xliff:g> години</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="one">через <xliff:g id="COUNT_1">%d</xliff:g> день</item> + <item quantity="few">через <xliff:g id="COUNT_1">%d</xliff:g> дні</item> + <item quantity="many">через <xliff:g id="COUNT_1">%d</xliff:g> днів</item> + <item quantity="other">через <xliff:g id="COUNT_1">%d</xliff:g> дня</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="one">через <xliff:g id="COUNT_1">%d</xliff:g> рік</item> + <item quantity="few">через <xliff:g id="COUNT_1">%d</xliff:g> роки</item> + <item quantity="many">через <xliff:g id="COUNT_1">%d</xliff:g> років</item> + <item quantity="other">через <xliff:g id="COUNT_1">%d</xliff:g> року</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Проблема з відео"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Відео не придатне для потокового передавання в цей пристрій."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Неможливо відтворити це відео."</string> @@ -992,8 +1040,7 @@ <string name="aerr_process" msgid="6201597323218674729">"Процес <xliff:g id="PROCESS">%1$s</xliff:g> перестав працювати"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"Додаток <xliff:g id="APPLICATION">%1$s</xliff:g> періодично перестає працювати"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"Процес \"<xliff:g id="PROCESS">%1$s</xliff:g>\" періодично перестає працювати"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Перезапустити додаток"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Скинути та перезапустити додаток"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Відкрити додаток знову"</string> <string name="aerr_report" msgid="5371800241488400617">"Надіслати відгук"</string> <string name="aerr_close" msgid="2991640326563991340">"Закрити"</string> <string name="aerr_mute" msgid="1974781923723235953">"Вимкнути звук до перезавантаження пристрою"</string> @@ -1550,7 +1597,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> видалено"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"Робоча <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Щоб відкріпити цей екран, натисніть і утримуйте кнопку \"Назад\"."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Щоб відкріпити цей екран, натисніть і утримуйте кнопку \"Огляд\"."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Додаток закріплено. Його не можна відкріпити на цьому пристрої."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Екран закріплено"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Екран відкріплено"</string> @@ -1633,6 +1679,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Запит SS перетворено на запит USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Запит SS перетворено на новий запит SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Робочий профіль"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Кнопка \"Розгорнути\""</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"розгорнути або згорнути"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Периферійний USB-порт Android"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"Периферійний USB-порт"</string> @@ -1640,6 +1688,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Закрити розширені інструменти"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Розгорнути"</string> <string name="close_button_text" msgid="3937902162644062866">"Закрити"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="one">Вибрано <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="few">Вибрано <xliff:g id="COUNT_1">%1$d</xliff:g></item> @@ -1674,4 +1724,5 @@ <string name="negative_duration" msgid="5688706061127375131">"-<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Відновіть заводські параметри, щоб використовувати пристрій без обмежень"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Торкніться, щоб дізнатися більше."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> вимкнено"</string> </resources> diff --git a/core/res/res/values-ur-rPK/strings.xml b/core/res/res/values-ur-rPK/strings.xml index bfff0ba8ab9e..cf3e668451b4 100644 --- a/core/res/res/values-ur-rPK/strings.xml +++ b/core/res/res/values-ur-rPK/strings.xml @@ -891,6 +891,38 @@ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> سال میں</item> <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> سال میں</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> منٹ قبل</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> منٹ قبل</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> گھنٹے قبل</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> گھنٹہ قبل</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> دن قبل</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> دن قبل</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> سال قبل</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> سال قبل</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> منٹ میں</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> منٹ میں</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> گھنٹے میں</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> گھنٹہ میں</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> دن میں</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> دن میں</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> سال میں</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> سال میں</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"ویڈیو مسئلہ"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"یہ ویڈیو اس آلہ پر سلسلہ بندی کیلئے درست نہیں ہے۔"</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"یہ ویڈیو نہیں چل سکتا۔"</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> بند ہو گیا ہے"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> بار بار بند ہوتی ہے"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> بار بار بند ہوتی ہے"</string> - <string name="aerr_restart" msgid="9001379185665886595">"ایپ دوبارہ شروع کریں"</string> - <string name="aerr_reset" msgid="7645427603514220451">"ایپ کو دوبارہ ترتیب دیں اور دوبارہ شروع کریں"</string> + <string name="aerr_restart" msgid="7581308074153624475">"ایپ دوبارہ کھولیں"</string> <string name="aerr_report" msgid="5371800241488400617">"تاثرات بھیجیں"</string> <string name="aerr_close" msgid="2991640326563991340">"بند کریں"</string> <string name="aerr_mute" msgid="1974781923723235953">"آلہ دوبارہ اسٹارٹ ہونے تک خاموش رکھیں"</string> @@ -1515,7 +1546,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> کو حذف کر دیا گیا"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"دفتر <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"اس اسکرین سے پن ہٹانے کیلئے، پیچھے کو تھپتھپائیں اور دبا کر رکھیں۔"</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"اس اسکرین سے پن ہٹانے کیلئے، مجموعی جائزہ کو تھپتھپائیں اور دبا کر رکھیں۔"</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"ایپ کو پن کر دیا گیا ہے: اس آلہ پر پن ہٹانے کی اجازت نہیں ہے۔"</string> <string name="lock_to_app_start" msgid="6643342070839862795">"اسکرین کو پن کر دیا گیا"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"اسکرین کا پن ہٹا دیا گیا"</string> @@ -1582,6 +1612,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS درخواست میں ترمیم کر کے USSD درخواست بنا دی گئی ہے۔"</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS درخواست میں ترمیم کر کے نئی SS درخواست بنا دی گئی ہے۔"</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"دفتری پروفائل"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"پھیلائیں بٹن"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"پھیلاؤ کو ٹوگل کریں"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB پیرفرل پورٹ"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB پیرفرل پورٹ"</string> @@ -1589,6 +1621,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"اوورفلو بند کریں"</string> <string name="maximize_button_text" msgid="7543285286182446254">"بڑا کریں"</string> <string name="close_button_text" msgid="3937902162644062866">"بند کریں"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> منتخب کردہ</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> منتخب کردہ</item> @@ -1621,4 +1655,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"بغیر کسی حدود کے استعمال کرنے کیلئے اس آلے کو فیکٹری ری سیٹ کریں"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"مزید جاننے کیلئے ٹچ کریں۔"</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"غیر فعال کردہ <xliff:g id="LABEL">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-uz-rUZ/strings.xml b/core/res/res/values-uz-rUZ/strings.xml index 4177d02c0ef0..7d59aef14ed3 100644 --- a/core/res/res/values-uz-rUZ/strings.xml +++ b/core/res/res/values-uz-rUZ/strings.xml @@ -42,7 +42,7 @@ <string name="untitled" msgid="4638956954852782576">"<Nomsiz>"</string> <string name="emptyPhoneNumber" msgid="7694063042079676517">"(Telefon raqami yo‘q)"</string> <string name="unknownName" msgid="6867811765370350269">"Noma’lum"</string> - <string name="defaultVoiceMailAlphaTag" msgid="2660020990097733077">"Ovozli xabar"</string> + <string name="defaultVoiceMailAlphaTag" msgid="2660020990097733077">"Ovozli pochta"</string> <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> <string name="mmiError" msgid="5154499457739052907">"Ulanishda xato yoki noto‘g‘ri MMI kodi."</string> <string name="mmiFdnError" msgid="5224398216385316471">"Bu amal faqat ruxsat etilgan raqamlar uchun mavjud."</string> @@ -71,8 +71,8 @@ <string name="ClirMmi" msgid="7784673673446833091">"Chiquvchi raqami"</string> <string name="ColpMmi" msgid="3065121483740183974">"Qo‘ng‘iroq qiluvchining raqami"</string> <string name="ColrMmi" msgid="4996540314421889589">"Qo‘ng‘iroq qiluvchining raqamini cheklash"</string> - <string name="CfMmi" msgid="5123218989141573515">"Boshqa raqamga yo‘naltirish"</string> - <string name="CwMmi" msgid="9129678056795016867">"Qo‘ng‘iroqni kutish"</string> + <string name="CfMmi" msgid="5123218989141573515">"Chaqiruvni yo‘naltirish"</string> + <string name="CwMmi" msgid="9129678056795016867">"Chaqiruvni kutish"</string> <string name="BaMmi" msgid="455193067926770581">"Qo‘ng‘iroqlarni taqiqlash"</string> <string name="PwdMmi" msgid="7043715687905254199">"Parolni o‘zgartirish"</string> <string name="PinMmi" msgid="3113117780361190304">"PIN kodni o‘zgartirish"</string> @@ -251,7 +251,7 @@ <string name="permgrouplab_sms" msgid="228308803364967808">"SMS"</string> <string name="permgroupdesc_sms" msgid="4656988620100940350">"SMS xabarlarni yuborish va ko‘rish"</string> <string name="permgrouplab_storage" msgid="1971118770546336966">"Xotira"</string> - <string name="permgroupdesc_storage" msgid="637758554581589203">"qurilmangizdagi rasm, multimedia va fayllarga kirish"</string> + <string name="permgroupdesc_storage" msgid="637758554581589203">"qurilmangizdagi surat, multimedia va fayllarga kirish"</string> <string name="permgrouplab_microphone" msgid="171539900250043464">"Mikrofon"</string> <string name="permgroupdesc_microphone" msgid="4988812113943554584">"ovoz yozib olish"</string> <string name="permgrouplab_camera" msgid="4820372495894586615">"Kamera"</string> @@ -595,7 +595,7 @@ <string name="phoneTypeFaxHome" msgid="2067265972322971467">"Faks (uy)"</string> <string name="phoneTypePager" msgid="7582359955394921732">"Peyjer"</string> <string name="phoneTypeOther" msgid="1544425847868765990">"Boshqa"</string> - <string name="phoneTypeCallback" msgid="2712175203065678206">"Qayta qo‘ng‘iroq"</string> + <string name="phoneTypeCallback" msgid="2712175203065678206">"Teskari chaqiruv"</string> <string name="phoneTypeCar" msgid="8738360689616716982">"Avtomobil"</string> <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Ofis"</string> <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string> @@ -673,7 +673,7 @@ <string name="lockscreen_instructions_when_pattern_enabled" msgid="46154051614126049">"Qulfdan chiqarish yoki favqulodda qo‘ng‘iroqni amalga oshirish uchun \"Menyu\"ni bosing."</string> <string name="lockscreen_instructions_when_pattern_disabled" msgid="686260028797158364">"Qulfni ochish uchun \"Menyu\"ga bosing."</string> <string name="lockscreen_pattern_instructions" msgid="7478703254964810302">"Qulfni ochish uchun namuna ustiga chizing"</string> - <string name="lockscreen_emergency_call" msgid="5298642613417801888">"Favqulodda qo‘ng‘iroq"</string> + <string name="lockscreen_emergency_call" msgid="5298642613417801888">"Favqulodda chaqiruv"</string> <string name="lockscreen_return_to_call" msgid="5244259785500040021">"Qo‘ng‘iroqni qaytarish"</string> <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"To‘g‘ri!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Qaytadan urining"</string> @@ -891,6 +891,38 @@ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> yildan keyin</item> <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> yildan keyin</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> daqiqa oldin</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> daqiqa oldin</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> soat oldin</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> soat oldin</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kun oldin</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kun oldin</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> yil oldin</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> yil oldin</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> daqiqadan keyin</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> daqiqadan keyin</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> soatdan keyin</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> soatdan keyin</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kundan keyin</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kundan keyin</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> yildan keyin</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> yildan keyin</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Video muammosi"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Ushbu videoni mazkur qurilmada oqimli rejimda ijro etib bo‘lmaydi."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Ushbu videoni ijro etib bo‘lmadi."</string> @@ -940,9 +972,9 @@ <string name="whichEditApplication" msgid="144727838241402655">"Tahrirlash…"</string> <string name="whichEditApplicationNamed" msgid="1775815530156447790">"“%1$s” yordamida tahrirlash"</string> <string name="whichEditApplicationLabel" msgid="7183524181625290300">"Tahrirlash"</string> - <string name="whichSendApplication" msgid="6902512414057341668">"Ulashish…"</string> + <string name="whichSendApplication" msgid="6902512414057341668">"Baham ko‘rish"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"“%1$s” orqali ulashish"</string> - <string name="whichSendApplicationLabel" msgid="4579076294675975354">"Ulashish"</string> + <string name="whichSendApplicationLabel" msgid="4579076294675975354">"Baham ko‘rish"</string> <string name="whichSendToApplication" msgid="8272422260066642057">"Ilovani tanlang"</string> <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"%1$s orqali yuborish"</string> <string name="whichSendToApplicationLabel" msgid="8878962419005813500">"Yuborish"</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> jarayoni ishdan chiqdi"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> yana ishdan chiqdi"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> yana ishdan chiqdi"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Ilovani qayta ishga tushirish"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Ilovani qayta tiklash va qayta ishga tushirish"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Ilovani qayta ochish"</string> <string name="aerr_report" msgid="5371800241488400617">"Fikr-mulohaza yuborish"</string> <string name="aerr_close" msgid="2991640326563991340">"Yopish"</string> <string name="aerr_mute" msgid="1974781923723235953">"Qurilma o‘chib yonguncha e’tiborsiz qoldirish"</string> @@ -1109,7 +1140,7 @@ <string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Xatoliklar hisoboti yuborilsinmi?"</string> <string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Xatoliklar hisoboti yuborilmoqda…"</string> <string name="share_remote_bugreport_notification_message_finished" msgid="8610614010660772643">"Administratoringiz bu qurilma nosozliklarini tuzatish uchun xatoliklar hisobotini so‘ramoqda. Ilova va ma’lumotlardan foydalanilishi mumkin."</string> - <string name="share_remote_bugreport_action" msgid="6249476773913384948">"ULASHISH"</string> + <string name="share_remote_bugreport_action" msgid="6249476773913384948">"BAHAM KO‘RISH"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"RAD ETISH"</string> <string name="select_input_method" msgid="8547250819326693584">"Klaviaturani o‘zgartirish"</string> <string name="show_ime" msgid="2506087537466597099">"Tashqi klaviaturadan foydalanilayotganda buni ekranda saqlab turish"</string> @@ -1168,7 +1199,7 @@ <string name="ime_action_go" msgid="8320845651737369027">"O‘tish"</string> <string name="ime_action_search" msgid="658110271822807811">"Qidirish"</string> <string name="ime_action_send" msgid="2316166556349314424">"Yuborish"</string> - <string name="ime_action_next" msgid="3138843904009813834">"Keyingi"</string> + <string name="ime_action_next" msgid="3138843904009813834">"Keyingisi"</string> <string name="ime_action_done" msgid="8971516117910934605">"Tayyor"</string> <string name="ime_action_previous" msgid="1443550039250105948">"Old."</string> <string name="ime_action_default" msgid="2840921885558045721">"Bajarish"</string> @@ -1211,7 +1242,7 @@ <string name="tethered_notification_title" msgid="3146694234398202601">"Modem rejimi yoniq"</string> <string name="tethered_notification_message" msgid="2113628520792055377">"Sozlash uchun bosing."</string> <string name="back_button_label" msgid="2300470004503343439">"Orqaga"</string> - <string name="next_button_label" msgid="1080555104677992408">"Keyingi"</string> + <string name="next_button_label" msgid="1080555104677992408">"Keyingisi"</string> <string name="skip_button_label" msgid="1275362299471631819">"Tashlab o‘tish"</string> <string name="no_matches" msgid="8129421908915840737">"Topilmadi"</string> <string name="find_on_page" msgid="1946799233822820384">"Sahifadan topish"</string> @@ -1315,7 +1346,7 @@ <string name="sha1_fingerprint" msgid="7930330235269404581">"SHA-1 barmoq izi:"</string> <string name="activity_chooser_view_see_all" msgid="4292569383976636200">"Barchasini ko‘rish"</string> <string name="activity_chooser_view_dialog_title_default" msgid="4710013864974040615">"Harakat turini tanlang"</string> - <string name="share_action_provider_share_with" msgid="5247684435979149216">"Ulashish"</string> + <string name="share_action_provider_share_with" msgid="5247684435979149216">"Baham ko‘rish"</string> <string name="sending" msgid="3245653681008218030">"Jo‘natilmoqda…"</string> <string name="launchBrowserDefault" msgid="2057951947297614725">"Brauzer ishga tushirilsinmi?"</string> <string name="SetupCallDefault" msgid="5834948469253758575">"Qo‘ng‘iroqni qabul qilasizmi?"</string> @@ -1515,7 +1546,6 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> raqami o‘chirib tashlandi"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"Ish <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Bu ekrandan chiqish uchun “Orqaga” tugmasini bosib turing."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Bu ekrandan chiqish uchun “Umumiy ma’lumot” tugmasini bosib turing."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Ilova qadab qo‘yilgan. Uni ekrandan yechish ushbu qurilmada ta’qiqlangan."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Ekran qadab qo‘yildi"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Ekran bo‘shatildi"</string> @@ -1526,7 +1556,7 @@ <string name="package_updated_device_owner" msgid="8856631322440187071">"Administratoringiz tomonidan yangilandi"</string> <string name="package_deleted_device_owner" msgid="7650577387493101353">"Administratoringiz tomonidan o‘chirilgan"</string> <string name="battery_saver_description" msgid="1960431123816253034">"Batareya quvvatini uzoqroq vaqtga yetkazish uchun quvvat tejash funksiyasi qurilmangiz unumdorligini kamaytiradi hamda uning tebranishi va orqa fonda internetdan foydalanishini cheklaydi. Sinxronlanishni talab qiladigan e-pochta, xabar almashinuv va boshqa ilovalar esa qachonki ularni ishga tushirganingizda yangilanadi.\n\nQurilma quvvat olayotganda quvvat tejash funksiyasi avtomatik tarzda o‘chadi."</string> - <string name="data_saver_description" msgid="6015391409098303235">"Trafik sarfini kamaytirish maqsadida Trafik tejash funksiyasi ba’zi ilovalarning orqa fonda internetdan foydalanishining oldini oladi. Siz hozirda foydalanayotgan ilova internetdan faqat talab etilgandagina foydalanishi mumkin. Bu degani, masalan, rasmlar ustiga bosilmaguncha, ular yuklanmaydi."</string> + <string name="data_saver_description" msgid="6015391409098303235">"Trafik tejash rejimida ayrim ilovalar uchun orqa fondan internetdan foydalanish imkoniyati cheklanadi. Siz ishlatayotgan ilova zaruratga qarab internet-trafik sarflashi mumkin, biroq cheklangan miqdorda. Masalan, rasmlar ustiga bosmaguningizcha ular yuklanmaydi."</string> <string name="data_saver_enable_title" msgid="4674073932722787417">"Trafik tejash yoqilsinmi?"</string> <string name="data_saver_enable_button" msgid="7147735965247211818">"Yoqish"</string> <plurals name="zen_mode_duration_minutes_summary" formatted="false" msgid="4367877408072000848"> @@ -1582,6 +1612,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS so‘rovi USSD so‘roviga o‘zgartirildi."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS so‘rovi yangi SS so‘roviga o‘zgartirildi."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Ishchi profil"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Yoyish tugmasi"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"ochish yoki yopish"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android tashqi USB porti"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"Tashqi USB porti"</string> @@ -1589,6 +1621,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Qalqib turuvchi asboblar panelini yopish"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Maksimallashtirish"</string> <string name="close_button_text" msgid="3937902162644062866">"Yopish"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ta tanlandi</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ta tanlandi</item> @@ -1621,4 +1655,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Bu qurilmadan cheklovlarsiz foydalanish uchun zavod sozlamalarini tiklang"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Ko‘proq o‘rganish uchun bosing."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"<xliff:g id="LABEL">%1$s</xliff:g> vidjeti o‘chirilgan"</string> </resources> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index 73d49267fc27..25729f06f75a 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -597,16 +597,16 @@ <string name="phoneTypeOther" msgid="1544425847868765990">"Khác"</string> <string name="phoneTypeCallback" msgid="2712175203065678206">"Số gọi lại"</string> <string name="phoneTypeCar" msgid="8738360689616716982">"Ô tô"</string> - <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Số điện thoại chính của Cơ quan"</string> + <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Số ĐT CQ chính"</string> <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string> - <string name="phoneTypeMain" msgid="6766137010628326916">"Số điện thoại chính"</string> + <string name="phoneTypeMain" msgid="6766137010628326916">"Số chính"</string> <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Số fax Khác"</string> <string name="phoneTypeRadio" msgid="4093738079908667513">"Radio"</string> <string name="phoneTypeTelex" msgid="3367879952476250512">"Số telex"</string> <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY TDD"</string> - <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Di động tại cơ quan"</string> - <string name="phoneTypeWorkPager" msgid="649938731231157056">"Số máy nhắn tin cơ quan"</string> - <string name="phoneTypeAssistant" msgid="5596772636128562884">"Số điện thoại Hỗ trợ"</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Di dộng CQ"</string> + <string name="phoneTypeWorkPager" msgid="649938731231157056">"Số nhắn tin CQ"</string> + <string name="phoneTypeAssistant" msgid="5596772636128562884">"Số hỗ trợ"</string> <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string> <string name="eventTypeCustom" msgid="7837586198458073404">"Tùy chỉnh"</string> <string name="eventTypeBirthday" msgid="2813379844211390740">"Ngày sinh"</string> @@ -891,6 +891,38 @@ <item quantity="other">trong <xliff:g id="COUNT_1">%d</xliff:g> năm</item> <item quantity="one">trong <xliff:g id="COUNT_0">%d</xliff:g> năm</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> phút trước</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> phút trước</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> giờ trước</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> giờ trước</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ngày trước</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ngày trước</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> năm trước</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> năm trước</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other">sau <xliff:g id="COUNT_1">%d</xliff:g> phút</item> + <item quantity="one">sau <xliff:g id="COUNT_0">%d</xliff:g> phút</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other">sau <xliff:g id="COUNT_1">%d</xliff:g> giờ</item> + <item quantity="one">sau <xliff:g id="COUNT_0">%d</xliff:g> giờ</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other">sau <xliff:g id="COUNT_1">%d</xliff:g> ngày</item> + <item quantity="one">sau <xliff:g id="COUNT_0">%d</xliff:g> ngày</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other">sau <xliff:g id="COUNT_1">%d</xliff:g> năm</item> + <item quantity="one">sau <xliff:g id="COUNT_0">%d</xliff:g> năm</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Sự cố video"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Video này không hợp lệ để phát trực tuyến đến thiết bị này."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Không thể phát video này."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> đã dừng"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> tiếp tục dừng"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> tiếp tục dừng"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Khởi động lại ứng dụng"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Đặt lại và khởi động lại ứng dụng"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Mở lại ứng dụng"</string> <string name="aerr_report" msgid="5371800241488400617">"Gửi phản hồi"</string> <string name="aerr_close" msgid="2991640326563991340">"Đóng"</string> <string name="aerr_mute" msgid="1974781923723235953">"Tắt tiếng cho đến khi thiết bị khởi động lại"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"Đã xóa <xliff:g id="KEY">%1$s</xliff:g>"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> làm việc"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Để bỏ ghim màn hình này, nhấn và giữ Quay lại."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Để bỏ ghim màn hình này, chạm và giữ Tổng quan."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Ứng dụng được ghim: Không được phép bỏ ghim trên thiết bị này."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Đã ghim màn hình"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Đã bỏ ghim màn hình"</string> @@ -1523,7 +1553,7 @@ <string name="package_updated_device_owner" msgid="8856631322440187071">"Được cập nhật bởi quản trị viên của bạn"</string> <string name="package_deleted_device_owner" msgid="7650577387493101353">"Đã bị xóa bởi quản trị viên của bạn"</string> <string name="battery_saver_description" msgid="1960431123816253034">"Để giúp tăng tuổi thọ pin, trình tiết kiệm pin sẽ giảm hiệu suất thiết bị của bạn và hạn chế rung, dịch vụ vị trí và hầu hết dữ liệu nền. Email, nhắn tin và các ứng dụng khác dựa trên đồng bộ hóa có thể không cập nhật nếu bạn không mở chúng.\n\nTrình tiết kiệm pin tự động tắt khi thiết bị của bạn đang sạc."</string> - <string name="data_saver_description" msgid="6015391409098303235">"Để giúp giảm mức sử dụng dữ liệu. Trình tiết kiệm dữ liệu chặn một số ứng dụng gửi hoặc nhận dữ liệu trong nền. Ứng dụng mà bạn hiện sử dụng có thể truy cập dữ liệu, nhưng có thể thực hiện việc đó ít thường xuyên hơn. Chẳng hạn, điều này có thể có nghĩa là hình ảnh sẽ không hiển thị cho đến khi bạn nhấn vào hình ảnh đó."</string> + <string name="data_saver_description" msgid="6015391409098303235">"Để giúp giảm mức sử dụng dữ liệu. Trình tiết kiệm dữ liệu chặn một số ứng dụng gửi hoặc nhận dữ liệu trong nền. Ứng dụng mà bạn hiện sử dụng có thể truy cập dữ liệu nhưng có thể thực hiện việc đó ít thường xuyên hơn. Ví như, hình ảnh sẽ không hiển thị cho đến khi bạn nhấn vào hình ảnh đó."</string> <string name="data_saver_enable_title" msgid="4674073932722787417">"Bật Trình tiết kiệm dữ liệu?"</string> <string name="data_saver_enable_button" msgid="7147735965247211818">"Bật"</string> <plurals name="zen_mode_duration_minutes_summary" formatted="false" msgid="4367877408072000848"> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Yêu cầu SS được sửa đổi thành yêu cầu USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Yêu cầu SS được sửa đổi thành yêu cầu SS mới."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Hồ sơ công việc"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Nút mở rộng"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"chuyển đổi mở rộng"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Cổng ngoại vi USB Android"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"Cổng ngoại vi USB"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Đóng tràn"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Tối đa hóa"</string> <string name="close_button_text" msgid="3937902162644062866">"Đóng"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other">Đã chọn <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="one">Đã chọn <xliff:g id="COUNT_0">%1$d</xliff:g></item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Khôi phục cài đặt gốc để sử dụng thiết bị này mà không bị hạn chế"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Chạm để tìm hiểu thêm."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Đã tắt <xliff:g id="LABEL">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index defd0a66b2eb..32dffe5e372a 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -891,6 +891,38 @@ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 年后</item> <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 年后</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 分钟前</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 分钟前</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 小时前</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 小时前</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 天前</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 天前</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 年前</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 年前</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 分钟后</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 分钟后</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 小时后</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 小时后</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 天后</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 天后</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 年后</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 年后</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"视频问题"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"抱歉，该视频不适合在此设备上播放。"</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"无法播放此视频。"</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g>已停止运行"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g>屡次停止运行"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g>屡次停止运行"</string> - <string name="aerr_restart" msgid="9001379185665886595">"重启应用"</string> - <string name="aerr_reset" msgid="7645427603514220451">"重置并重启应用"</string> + <string name="aerr_restart" msgid="7581308074153624475">"重新打开应用"</string> <string name="aerr_report" msgid="5371800241488400617">"发送反馈"</string> <string name="aerr_close" msgid="2991640326563991340">"关闭"</string> <string name="aerr_mute" msgid="1974781923723235953">"忽略（直到设备重启）"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"已删除<xliff:g id="KEY">%1$s</xliff:g>"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"工作<xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"要取消固定此屏幕，请触摸并按住“返回”按钮。"</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"要取消固定此屏幕，请触摸并按住“概览”按钮。"</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"应用处于固定状态：在此设备上不允许退出该模式。"</string> <string name="lock_to_app_start" msgid="6643342070839862795">"已固定屏幕"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"已取消固定屏幕"</string> @@ -1579,6 +1609,9 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS 请求已修改为 USSD 请求。"</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS 请求已修改为新的 SS 请求。"</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"工作资料"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"展开按钮"</string> + <!-- no translation found for expand_action_accessibility (5307730695723718254) --> + <skip /> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB 外设端口"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB 外设端口"</string> @@ -1586,6 +1619,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"关闭工具栏溢出"</string> <string name="maximize_button_text" msgid="7543285286182446254">"最大化"</string> <string name="close_button_text" msgid="3937902162644062866">"关闭"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other">已选择 <xliff:g id="COUNT_1">%1$d</xliff:g> 项</item> <item quantity="one">已选择 <xliff:g id="COUNT_0">%1$d</xliff:g> 项</item> @@ -1618,4 +1653,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"恢复出厂设置即可正常使用此设备，不受任何限制"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"触摸即可了解详情。"</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"已停用的<xliff:g id="LABEL">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml index 4b1cfbbb9b34..5baeb8406816 100644 --- a/core/res/res/values-zh-rHK/strings.xml +++ b/core/res/res/values-zh-rHK/strings.xml @@ -891,6 +891,38 @@ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 年後</item> <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 年後</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 分鐘前</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 分鐘前</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 小時前</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 小時前</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 天前</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 天前</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 年前</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 年前</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 分鐘後</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 分鐘後</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 小時後</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 小時後</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 天後</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 天後</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 年後</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 年後</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"影片問題"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"這部影片的格式無效，無法以串流傳送至這部裝置。"</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"無法播放這部影片。"</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"「<xliff:g id="PROCESS">%1$s</xliff:g>」已經停止運作"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"「<xliff:g id="APPLICATION">%1$s</xliff:g>」不斷停止運作"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"「<xliff:g id="PROCESS">%1$s</xliff:g>」不斷停止運作"</string> - <string name="aerr_restart" msgid="9001379185665886595">"重新啟動應用程式"</string> - <string name="aerr_reset" msgid="7645427603514220451">"重設並重新啟動應用程式"</string> + <string name="aerr_restart" msgid="7581308074153624475">"再次開啟應用程式"</string> <string name="aerr_report" msgid="5371800241488400617">"傳送意見反映"</string> <string name="aerr_close" msgid="2991640326563991340">"關閉"</string> <string name="aerr_mute" msgid="1974781923723235953">"忽略直至裝置重新啟動"</string> @@ -1512,12 +1543,11 @@ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> 已刪除"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"公司<xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"如要取消固定這個畫面，請按住 [返回]。"</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"如要取消固定這個畫面，請按住 [概覽]。"</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"應用程式已固定：不允許在此裝置上取消固定。"</string> <string name="lock_to_app_start" msgid="6643342070839862795">"螢幕已固定"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"已取消固定螢幕"</string> <string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"取消固定時必須輸入 PIN"</string> - <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"取消固定時必須畫出解鎖圖案"</string> + <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"取消固定時必須提供解鎖圖形"</string> <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"取消固定時必須輸入密碼"</string> <string name="package_installed_device_owner" msgid="8420696545959087545">"已由管理員安裝"</string> <string name="package_updated_device_owner" msgid="8856631322440187071">"已由您的管理員更新"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS 要求已修改為 USSD 要求。"</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS 要求已修改為新的 SS 要求。"</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"工作設定檔"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"展開按鈕"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"切換展開"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB 外端連接埠"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB 外端連接埠"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"關閉工具列溢位功能"</string> <string name="maximize_button_text" msgid="7543285286182446254">"最大化"</string> <string name="close_button_text" msgid="3937902162644062866">"關閉"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other">已選取 <xliff:g id="COUNT_1">%1$d</xliff:g> 個項目</item> <item quantity="one">已選取 <xliff:g id="COUNT_0">%1$d</xliff:g> 個項目</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"將此裝置回復至原廠設定後，使用將不受限制"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"輕觸以瞭解詳情。"</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"「<xliff:g id="LABEL">%1$s</xliff:g>」已停用"</string> </resources> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index 91183314c7d8..83f487fc316a 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -891,6 +891,38 @@ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 年內</item> <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 年內</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 分鐘前</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 分鐘前</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 小時前</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 小時前</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 天前</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 天前</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 年前</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 年前</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 分鐘後</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 分鐘後</item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 小時後</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 小時後</item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 天後</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 天後</item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 年後</item> + <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 年後</item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"影片發生問題"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"這部影片的格式無效，因此無法在此裝置中串流播放。"</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"無法播放這部影片。"</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"「<xliff:g id="PROCESS">%1$s</xliff:g>」已停止運作"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"「<xliff:g id="APPLICATION">%1$s</xliff:g>」屢次停止運作"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"「<xliff:g id="PROCESS">%1$s</xliff:g>」屢次停止運作"</string> - <string name="aerr_restart" msgid="9001379185665886595">"重新啟動應用程式"</string> - <string name="aerr_reset" msgid="7645427603514220451">"重設並重新啟動應用程式"</string> + <string name="aerr_restart" msgid="7581308074153624475">"再次開啟應用程式"</string> <string name="aerr_report" msgid="5371800241488400617">"提供意見"</string> <string name="aerr_close" msgid="2991640326563991340">"關閉"</string> <string name="aerr_mute" msgid="1974781923723235953">"略過直到裝置重新啟動"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"已刪除 <xliff:g id="KEY">%1$s</xliff:g>"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"公司<xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"如要取消固定這個畫面，請按住「返回」按鈕。"</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"如要取消固定這個畫面，請按住「總覽」按鈕。"</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"應用程式已固定：無法在這部裝置取消固定。"</string> <string name="lock_to_app_start" msgid="6643342070839862795">"已固定螢幕"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"已取消固定螢幕"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"SS 要求已改為 USSD 要求。"</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"SS 要求已改為新的 SS 要求。"</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Work 設定檔"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"展開按鈕"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"切換展開模式"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB 週邊連接埠"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB 週邊連接埠"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"關閉溢出模式"</string> <string name="maximize_button_text" msgid="7543285286182446254">"最大化"</string> <string name="close_button_text" msgid="3937902162644062866">"關閉"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="other">已選取 <xliff:g id="COUNT_1">%1$d</xliff:g> 個項目</item> <item quantity="one">已選取 <xliff:g id="COUNT_0">%1$d</xliff:g> 個項目</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"恢復原廠設定即可正常使用這個裝置"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"輕觸即可瞭解詳情。"</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"已停用的<xliff:g id="LABEL">%1$s</xliff:g>"</string> </resources> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index 55d4b7306c7c..5a966239f832 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -891,6 +891,38 @@ <item quantity="one">ku-<xliff:g id="COUNT_1">%d</xliff:g>y</item> <item quantity="other">ku-<xliff:g id="COUNT_1">%d</xliff:g>y</item> </plurals> + <plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> amaminithi adlule</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> amaminithi adlule</item> + </plurals> + <plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> amahora adlule</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> amahora adlule</item> + </plurals> + <plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> izinsuku ezidlule</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> izinsuku ezidlule</item> + </plurals> + <plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734"> + <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> iminyaka eyedlule</item> + <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> iminyaka eyedlule</item> + </plurals> + <plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966"> + <item quantity="one">kumaminithi angu-<xliff:g id="COUNT_1">%d</xliff:g></item> + <item quantity="other">kumaminithi angu-<xliff:g id="COUNT_1">%d</xliff:g></item> + </plurals> + <plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891"> + <item quantity="one">emahoreni angu-<xliff:g id="COUNT_1">%d</xliff:g></item> + <item quantity="other">emahoreni angu-<xliff:g id="COUNT_1">%d</xliff:g></item> + </plurals> + <plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992"> + <item quantity="one">ezinsukwini ezingu-<xliff:g id="COUNT_1">%d</xliff:g></item> + <item quantity="other">ezinsukwini ezingu-<xliff:g id="COUNT_1">%d</xliff:g></item> + </plurals> + <plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011"> + <item quantity="one">eminyakeni engu-<xliff:g id="COUNT_1">%d</xliff:g></item> + <item quantity="other">eminyakeni engu-<xliff:g id="COUNT_1">%d</xliff:g></item> + </plurals> <string name="VideoView_error_title" msgid="3534509135438353077">"Inkinga yevidiyo"</string> <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Uxolo, le vidiyo ayilungele ukusakaza bukhomo kwale divaysi."</string> <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Iyehluleka ukudlala levidiyo."</string> @@ -962,8 +994,7 @@ <string name="aerr_process" msgid="6201597323218674729">"I-<xliff:g id="PROCESS">%1$s</xliff:g> imile"</string> <string name="aerr_application_repeated" msgid="3146328699537439573">"I-<xliff:g id="APPLICATION">%1$s</xliff:g> ilokhu iyama"</string> <string name="aerr_process_repeated" msgid="6235302956890402259">"I-<xliff:g id="PROCESS">%1$s</xliff:g> ilokhu iyama"</string> - <string name="aerr_restart" msgid="9001379185665886595">"Qala kabusha uhlelo lokusebenza"</string> - <string name="aerr_reset" msgid="7645427603514220451">"Setha kabusha uphinde uqalise kabusha uhlelo lokusebenza"</string> + <string name="aerr_restart" msgid="7581308074153624475">"Vula uhlelo lokusebenza futhi"</string> <string name="aerr_report" msgid="5371800241488400617">"Thumela impendulo"</string> <string name="aerr_close" msgid="2991640326563991340">"Vala"</string> <string name="aerr_mute" msgid="1974781923723235953">"Thulisa ize iqalise kabusha idivayisi"</string> @@ -1512,7 +1543,6 @@ <string name="deleted_key" msgid="7659477886625566590">"I-<xliff:g id="KEY">%1$s</xliff:g> isusiwe"</string> <string name="managed_profile_label_badge" msgid="2355652472854327647">"Umsebenzi <xliff:g id="LABEL">%1$s</xliff:g>"</string> <string name="lock_to_app_toast" msgid="1420543809500606964">"Ukuze ususe ukuphina lesi sikrini, thinta futhi ubambe okuthi Emuva."</string> - <string name="lock_to_app_toast_accessible" msgid="2302154926850846096">"Ukuze ususe ukuphina lesi sikrini, thinta futhi ubambe okuthi Buka konke."</string> <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Uhlelo lokusebenza luphiniwe: Ukususa ukuphina akuvunyelwe kule divayisi."</string> <string name="lock_to_app_start" msgid="6643342070839862795">"Isikrini siphiniwe"</string> <string name="lock_to_app_exit" msgid="8598219838213787430">"Isikrini sisuswe ukuphina"</string> @@ -1579,6 +1609,8 @@ <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Isicelo se-SS siguqulelwe kusicelo se-USSD."</string> <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Isicelo se-SS siguqulelwe kusicelo esisha se-SS."</string> <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Iphrofayela yomsebenzi"</string> + <string name="expand_button_content_description" msgid="5855955413376384681">"Inkinobho yokunweba"</string> + <string name="expand_action_accessibility" msgid="5307730695723718254">"guqula ukunwebisa"</string> <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Imbobo ye-Android USB Peripheral"</string> <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"I-Android"</string> <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"Imbobo ye-USB Peripheral"</string> @@ -1586,6 +1618,8 @@ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Vala ukuchichima"</string> <string name="maximize_button_text" msgid="7543285286182446254">"Khulisa"</string> <string name="close_button_text" msgid="3937902162644062866">"Vala"</string> + <!-- no translation found for notification_messaging_title_template (3452480118762691020) --> + <skip /> <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> okukhethiwe</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> okukhethiwe</item> @@ -1618,4 +1652,5 @@ <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="audit_safemode_notification" msgid="6416076898350685856">"Setha kabusha ukuze usebenzise idivayisi ngaphandle kwemikhawulo"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Thinta ukuze ufunde kabanzi."</string> + <string name="suspended_widget_accessibility" msgid="6712143096475264190">"I-<xliff:g id="LABEL">%1$s</xliff:g> ekhutshaziwe"</string> </resources> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index ad02d29dcbf3..d0fd36ad269e 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2477,7 +2477,9 @@ remote provider --> <string name="config_tvRemoteServicePackage" translatable="false"></string> - <!-- True if the device supports persisting security logs across reboots. --> + <!-- True if the device supports persisting security logs across reboots. + This requires the device's kernel to have pstore and pmsg enabled, + and DRAM to be powered and refreshed through all stages of reboot. --> <bool name="config_supportPreRebootSecurityLogs">false</bool> <!-- Default files to pin via Pinner Service --> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 22329422251b..48744b61b965 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -2474,6 +2474,54 @@ <item quantity="other">in <xliff:g example="2" id="count">%d</xliff:g>y</item> </plurals> + <!-- Phrase describing a relative time using minutes in the past that is not shown on the screen but used for accessibility. [CHAR LIMIT=NONE] --> + <plurals name="duration_minutes_relative"> + <item quantity="one"><xliff:g example="1" id="count">%d</xliff:g> minute ago</item> + <item quantity="other"><xliff:g example="2" id="count">%d</xliff:g> minutes ago</item> + </plurals> + + <!-- Phrase describing a relative time using hours in the past that is not shown on the screen but used for accessibility. [CHAR LIMIT=NONE] --> + <plurals name="duration_hours_relative"> + <item quantity="one"><xliff:g example="1" id="count">%d</xliff:g> hour ago</item> + <item quantity="other"><xliff:g example="2" id="count">%d</xliff:g> hours ago</item> + </plurals> + + <!-- Phrase describing a relative time using days in the past that is not shown on the screen but used for accessibility. [CHAR LIMIT=NONE] --> + <plurals name="duration_days_relative"> + <item quantity="one"><xliff:g example="1" id="count">%d</xliff:g> day ago</item> + <item quantity="other"><xliff:g example="2" id="count">%d</xliff:g> days ago</item> + </plurals> + + <!-- Phrase describing a relative time using years in the past that is not shown on the screen but used for accessibility. [CHAR LIMIT=NONE] --> + <plurals name="duration_years_relative"> + <item quantity="one"><xliff:g example="1" id="count">%d</xliff:g> year ago</item> + <item quantity="other"><xliff:g example="2" id="count">%d</xliff:g> years ago</item> + </plurals> + + <!-- Phrase describing a relative time using minutes that is not shown on the screen but used for accessibility. This version should be a future point in time. [CHAR LIMIT=NONE] --> + <plurals name="duration_minutes_relative_future"> + <item quantity="one">in <xliff:g example="1" id="count">%d</xliff:g> minute</item> + <item quantity="other">in <xliff:g example="2" id="count">%d</xliff:g> minutes</item> + </plurals> + + <!-- Phrase describing a relative time using hours that is not shown on the screen but used for accessibility. This version should be a future point in time. [CHAR LIMIT=NONE] --> + <plurals name="duration_hours_relative_future"> + <item quantity="one">in <xliff:g example="1" id="count">%d</xliff:g> hour</item> + <item quantity="other">in <xliff:g example="2" id="count">%d</xliff:g> hours</item> + </plurals> + + <!-- Phrase describing a relative time using days that is not shown on the screen but used for accessibility. This version should be a future point in time. [CHAR LIMIT=NONE] --> + <plurals name="duration_days_relative_future"> + <item quantity="one">in <xliff:g example="1" id="count">%d</xliff:g> day</item> + <item quantity="other">in <xliff:g example="2" id="count">%d</xliff:g> days</item> + </plurals> + + <!-- Phrase describing a relative time using years that is not shown on the screen but used for accessibility. This version should be a future point in time. [CHAR LIMIT=NONE] --> + <plurals name="duration_years_relative_future"> + <item quantity="one">in <xliff:g example="1" id="count">%d</xliff:g> year</item> + <item quantity="other">in <xliff:g example="2" id="count">%d</xliff:g> years</item> + </plurals> + <!-- Title for error alert when a video cannot be played. it can be used by any app. --> <string name="VideoView_error_title">Video problem</string> <!-- Text for error alert when a video container is not valid for progressive download/playback. --> @@ -2677,9 +2725,7 @@ <!-- Text of the alert that is displayed when a process has crashed repeatedly. --> <string name="aerr_process_repeated"><xliff:g id="process">%1$s</xliff:g> keeps stopping</string> <!-- Button that restarts a crashed application --> - <string name="aerr_restart">Restart app</string> - <!-- Button that clears cache and restarts a crashed application --> - <string name="aerr_reset">Reset and restart app</string> + <string name="aerr_restart">Open app again</string> <!-- Button that sends feedback about a crashed application --> <string name="aerr_report">Send feedback</string> <!-- Button that closes a crashed application --> @@ -4081,8 +4127,6 @@ <!-- Notify use that they are in Lock-to-app --> <string name="lock_to_app_toast">To unpin this screen, touch & hold Back.</string> - <!-- Notify use that they are in Lock-to-app in accessibility mode --> - <string name="lock_to_app_toast_accessible">To unpin this screen, touch & hold Overview.</string> <!-- Notify user that they are locked in lock-to-app mode --> <string name="lock_to_app_toast_locked">App is pinned: Unpinning isn\'t allowed on this device.</string> <!-- Starting lock-to-app indication. --> @@ -4215,6 +4259,12 @@ <!-- Content description of the work profile icon in the notification. --> <string name="notification_work_profile_content_description">Work profile</string> + <!-- Content description of the expand button icon in the notification.--> + <string name="expand_button_content_description">Expand button</string> + + <!-- Accessibility action description on the expand button. --> + <string name="expand_action_accessibility">toggle expansion</string> + <!-- User visible name for USB MIDI Peripheral port --> <string name="usb_midi_peripheral_name">Android USB Peripheral Port</string> <!-- Manufacturer name for USB MIDI Peripheral port --> @@ -4239,6 +4289,10 @@ DO NOT TRANSLATE --> <string name="notification_inbox_ellipsis">\u2026</string> + <!-- Tempalate for Notification.MessagingStyle to join a conversation name with the name of the sender of a message, to make a notification title [CHAR LIMIT=NONE] --> + <string name="notification_messaging_title_template"><xliff:g id="conversation_title" example="Tasty Treat Team">%1$s</xliff:g>: <xliff:g id="sender_name" example="Adrian Baker">%2$s</xliff:g></string> + + <!-- Label describing the number of selected items [CHAR LIMIT=48] --> <plurals name="selected_count"> <item quantity="one"><xliff:g id="count" example="1">%1$d</xliff:g> selected</item> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index f2c3c4291be9..abef7f8e91ac 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -698,7 +698,6 @@ <java-symbol type="string" name="last_month" /> <java-symbol type="string" name="launchBrowserDefault" /> <java-symbol type="string" name="lock_to_app_toast" /> - <java-symbol type="string" name="lock_to_app_toast_accessible" /> <java-symbol type="string" name="lock_to_app_toast_locked" /> <java-symbol type="string" name="lock_to_app_start" /> <java-symbol type="string" name="lock_to_app_exit" /> @@ -2446,7 +2445,6 @@ <java-symbol type="id" name="work_widget_badge_icon" /> <java-symbol type="id" name="aerr_report" /> - <java-symbol type="id" name="aerr_reset" /> <java-symbol type="id" name="aerr_restart" /> <java-symbol type="id" name="aerr_close" /> <java-symbol type="id" name="aerr_mute" /> @@ -2522,6 +2520,15 @@ <java-symbol type="plurals" name="duration_days_shortest_future" /> <java-symbol type="plurals" name="duration_years_shortest_future" /> + <java-symbol type="plurals" name="duration_minutes_relative" /> + <java-symbol type="plurals" name="duration_hours_relative" /> + <java-symbol type="plurals" name="duration_days_relative" /> + <java-symbol type="plurals" name="duration_years_relative" /> + <java-symbol type="plurals" name="duration_minutes_relative_future" /> + <java-symbol type="plurals" name="duration_hours_relative_future" /> + <java-symbol type="plurals" name="duration_days_relative_future" /> + <java-symbol type="plurals" name="duration_years_relative_future" /> + <java-symbol type="string" name="now_string_shortest" /> <!-- Encryption notification while accounts are locked by credential encryption --> @@ -2559,6 +2566,7 @@ <!-- WallpaperManager config --> <java-symbol type="string" name="config_wallpaperCropperPackage" /> + <java-symbol type="string" name="expand_action_accessibility" /> <java-symbol type="id" name="textSpacerNoTitle" /> <java-symbol type="id" name="titleDividerNoCustom" /> @@ -2590,6 +2598,7 @@ <!-- TV Remote Service package --> <java-symbol type="string" name="config_tvRemoteServicePackage" /> + <java-symbol type="string" name="notification_messaging_title_template" /> <java-symbol type="bool" name="config_supportPreRebootSecurityLogs" /> diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml index 998eea5ac9ab..aecda44a6583 100644 --- a/core/res/res/values/themes.xml +++ b/core/res/res/values/themes.xml @@ -174,7 +174,6 @@ please see themes_device_defaults.xml. <!-- Window attributes --> <item name="windowBackground">@drawable/screen_background_selector_dark</item> - <item name="windowBackgroundFallback">?attr/colorBackground</item> <item name="windowClipToOutline">false</item> <item name="windowFrame">@null</item> <item name="windowNoTitle">false</item> diff --git a/data/etc/platform.xml b/data/etc/platform.xml index a26850f5a3af..627f3601de2f 100644 --- a/data/etc/platform.xml +++ b/data/etc/platform.xml @@ -170,7 +170,7 @@ <!-- These are the standard packages that are white-listed to always have internet access while in power save mode, even if they aren't in the foreground. --> - <allow-in-power-save-except-idle package="com.android.providers.downloads" /> + <allow-in-power-save package="com.android.providers.downloads" /> <!-- These are the standard packages that are white-listed to always have internet access while in data mode, even if they aren't in the foreground. --> diff --git a/docs/html/_redirects.yaml b/docs/html/_redirects.yaml index 42c88896c6c5..741e85c83fb6 100644 --- a/docs/html/_redirects.yaml +++ b/docs/html/_redirects.yaml @@ -50,25 +50,25 @@ redirects: - from: /tools/sdk/installing.html to: /studio/index.html - from: /tools/eclipse/installing-adt.html - to: /studio/tools/help/adt.html + to: /studio/tools/sdk/eclipse-adt.html - from: /sdk/requirements.html to: /studio/index.html - from: /sdk/installing/next.html to: /training/basics/firstapp/index.html - from: /sdk/installing/installing-adt.html - to: /studio/tools/help/adt.html + to: /studio/tools/sdk/eclipse-adt.html - from: /tools/projects/projects-eclipse.html - to: /studio/tools/help/adt.html + to: /studio/tools/sdk/eclipse-adt.html - from: /tools/building/building-eclipse.html - to: /studio/tools/help/adt.html + to: /studio/tools/sdk/eclipse-adt.html - from: /tools/building/building-cmdline-ant.html - to: /studio/tools/help/adt.html + to: /studio/tools/sdk/eclipse-adt.html - from: /tools/testing/testing_eclipse.html - to: /studio/tools/help/adt.html + to: /studio/tools/sdk/eclipse-adt.html - from: /tools/debugging/debugging-projects.html - to: /studio/tools/help/adt.html + to: /studio/tools/sdk/eclipse-adt.html - from: /tools/publishing/app-signing-eclipse.html - to: /studio/tools/help/adt.html + to: /studio/tools/sdk/eclipse-adt.html - from: /tools/testing/testing_ui.html to: /training/testing/ui-testing/index.html - from: /tools/testing/activity_test.html @@ -99,10 +99,6 @@ redirects: to: /training/testing/ui-testing/index.html - from: /guide/market/ to: /google/play/ -- from: /guide/google/gcm/client-javadoc/... - to: /reference/com/google/android/gms/gcm/package-summary.html -- from: /guide/google/gcm/server-javadoc/... - to: /reference/com/google/android/gms/gcm/package-summary.html - from: /guide/google/play/services.html to: https://developers.google.com/android/guides/overview - from: /guide/google/ @@ -710,7 +706,9 @@ redirects: - from: /training/enterprise/app-compatibility.html to: /work/managed-profiles.html - from: /training/enterprise/app-restrictions.html - to: /work/app-restrictions.html + to: /work/managed-configurations.html +- from: /work/app-restrictions.html + to: /work/managed-configurations.html - from: /training/enterprise/cosu.html to: /work/cosu.html - from: /training/enterprise/device-management-policy.html @@ -771,10 +769,6 @@ redirects: to: https://developers.google.com/android/guides/api-client - from: /google/auth/http-auth.html to: https://developers.google.com/android/guides/http-auth -- from: /reference/gms-packages.html - to: https://developers.google.com/android/reference/packages -- from: /reference/com/google/android/gms/ - to: https://developers.google.com/android/reference/com/google/android/gms/ - from: /preview/features/runtime-permissions.html to: /training/permissions/index.html - from: /preview/features/app-linking.html @@ -845,6 +839,8 @@ redirects: to: /studio/run/emulator.html - from: /r/studio-ui/instant-run.html to: /studio/run/index.html#instant-run +- from: /r/studio-ui/test-recorder.html + to: http://tools.android.com/tech-docs/test-recorder - from: /reference/org/apache/http/... to: /about/versions/marshmallow/android-6.0-changes.html#behavior-apache-http-client - from: /shareables/... @@ -863,11 +859,18 @@ redirects: - from: /tools/testing-support-library/... to: /topic/libraries/testing-support-library/... -# GCM redirects +# GMS and GCM reference redirects +- from: /reference/gms-packages.html + to: https://developers.google.com/android/reference/packages +- from: /guide/google/gcm/client-javadoc/... + to: https://developers.google.com/android/reference/com/google/android/gms/gcm/package-summary +- from: /guide/google/gcm/server-javadoc/... + to: https://developers.google.com/android/reference/com/google/android/gms/gcm/package-summary +- from: /reference/com/google/android/gcm/... + to: https://developers.google.com/android/reference/com/google/android/gms/gcm/package-summary - from: /reference/com/google/... to: https://developers.google.com/android/reference/com/google/... - # Files moved during the /studio restructure - from: /sdk/index.html to: /studio/index.html @@ -1145,6 +1148,8 @@ redirects: to: /studio/profile/ddms.html - from: /tools/revisions/index.html to: /studio/releases/index.html +- from: /tools/help/adt.html + to: /studio/tools/sdk/eclipse-adt.html # Just incase something was missed, go to intro page - from: /tools/... diff --git a/docs/html/about/dashboards/index.jd b/docs/html/about/dashboards/index.jd index f4a03dbddfa2..fff26081745d 100644 --- a/docs/html/about/dashboards/index.jd +++ b/docs/html/about/dashboards/index.jd @@ -63,19 +63,10 @@ Platform Versions</a>.</p> <br/>Any versions with less than 0.1% distribution are not shown.</em> </p> -<p class="note"><strong>Note:</strong> This data is gathered from the new Google Play -Store app, which supports Android 2.2 and above, so devices running older versions are not included. -However, in August, 2013, versions older than Android 2.2 accounted for about 1% of devices that -<em>checked in</em> to Google servers (not those that actually visited Google Play Store). -</p> - - - <h2 id="Screens">Screen Sizes and Densities</h2> - <p>This section provides data about the relative number of devices that have a particular screen configuration, defined by a combination of screen size and density. To simplify the way that you design your user interfaces for different screen configurations, Android divides the range of diff --git a/docs/html/distribute/googleplay/work/about.jd b/docs/html/distribute/googleplay/work/about.jd index 79e8a899f46f..b60c197a2ee1 100644 --- a/docs/html/distribute/googleplay/work/about.jd +++ b/docs/html/distribute/googleplay/work/about.jd @@ -56,8 +56,8 @@ page.image=images/distribute/gpfw.jpg properly. Businesses are more conscious of data security and employee productivity, especially when it comes to features that share information with other services.</li> - <li>Support the <a href="{@docRoot}work/app-restrictions.html" - >App Configuration framework</a> to let an administrator remotely + <li>Support <a href="{@docRoot}work/managed-configurations.html" + >managed configurations</a> to let an administrator remotely configure app settings such as: <ul> <li>Server address and protocol settings</li> @@ -74,16 +74,26 @@ page.image=images/distribute/gpfw.jpg profile</a> and test that with the <a href="{@docRoot}samples/BasicManagedProfile/index.html" >BasicManagedProfile sample app</a>.</li> - <li>Support <a href="{@docRoot}work/app-restrictions.html">app restrictions</a> - so that IT admins can remotely configure your app through leading - EMM solutions.</li> + <li>Support <a href="{@docRoot}work/managed-configurations.html" + >managed configurations</a> so that IT admins can remotely + configure your app through leading EMM solutions.</li> </ul> <h3 id="support">Provide support and maintenance</h3> <ul> -<li>Consider offering enhanced support to cover extended hours or specific means of contact. Businesses are often willing to pay for this service.</li> -<li>If you update the App Configuration / App Restrictions schema for your app, make sure it remains backward compatible. This is because it’s possible that different users will have different versions of your app (at least temporarily), and IT admin will want a consistent remote configuration experience between versions to ensure efficient management of apps in the field.</li> + <li> + Consider offering enhanced support to cover extended hours or + specific means of contact. Businesses are often willing to pay for + this service. + </li> + <li> + If you update the app configuration / managed configuration schema for + your app, make sure it remains backward compatible. This is because + it’s possible that different users will have different versions of + your app (at least temporarily), and IT admin will want a consistent + remote configuration experience between versions to ensure efficient + management of apps in the field.</li> </ul> <h2 id=related_resources>Related resources</h2> diff --git a/docs/html/guide/topics/manifest/manifest-intro.jd b/docs/html/guide/topics/manifest/manifest-intro.jd index d7b176e810a0..c843567488e5 100644 --- a/docs/html/guide/topics/manifest/manifest-intro.jd +++ b/docs/html/guide/topics/manifest/manifest-intro.jd @@ -31,27 +31,27 @@ page.title=App Manifest <li>It names the Java package for the application. The package name serves as a unique identifier for the application.</li> -<li>It describes the components of the application — the activities, -services, broadcast receivers, and content providers that the application is -composed of. It names the classes that implement each of the components and -publishes their capabilities (for example, which {@link android.content.Intent -Intent} messages they can handle). These declarations let the Android system +<li>It describes the components of the application — the activities, +services, broadcast receivers, and content providers that the application is +composed of. It names the classes that implement each of the components and +publishes their capabilities (for example, which {@link android.content.Intent +Intent} messages they can handle). These declarations let the Android system know what the components are and under what conditions they can be launched.</li> -<li>It determines which processes will host application components.</li> +<li>It determines which processes will host application components.</li> -<li>It declares which permissions the application must have in order to -access protected parts of the API and interact with other applications.</li> +<li>It declares which permissions the application must have in order to +access protected parts of the API and interact with other applications.</li> -<li>It also declares the permissions that others are required to have in +<li>It also declares the permissions that others are required to have in order to interact with the application's components.</li> -<li>It lists the {@link android.app.Instrumentation} classes that provide -profiling and other information as the application is running. These declarations -are present in the manifest only while the application is being developed and +<li>It lists the {@link android.app.Instrumentation} classes that provide +profiling and other information as the application is running. These declarations +are present in the manifest only while the application is being developed and tested; they're removed before the application is published.</li> -<li>It declares the minimum level of the Android API that the application +<li>It declares the minimum level of the Android API that the application requires.</li> <li>It lists the libraries that the application must be linked against.</li> @@ -61,12 +61,12 @@ requires.</li> <h2 id="filestruct">Structure of the Manifest File</h2> <p> -The diagram below shows the general structure of the manifest file and -every element that it can contain. Each element, along with all of its -attributes, is documented in full in a separate file. To view detailed -information about any element, click on the element name in the diagram, +The diagram below shows the general structure of the manifest file and +every element that it can contain. Each element, along with all of its +attributes, is documented in full in a separate file. To view detailed +information about any element, click on the element name in the diagram, in the alphabetical list of elements that follows the diagram, or on any -other mention of the element name. +other mention of the element name. </p> <pre> @@ -126,9 +126,9 @@ other mention of the element name. </pre> <p> -All the elements that can appear in the manifest file are listed below -in alphabetical order. These are the only legal elements; you cannot -add your own elements or attributes. +All the elements that can appear in the manifest file are listed below +in alphabetical order. These are the only legal elements; you cannot +add your own elements or attributes. </p> <p style="margin-left: 2em"> @@ -158,74 +158,86 @@ add your own elements or attributes. </p> - + <h2 id="filec">File Conventions</h2> <p> -Some conventions and rules apply generally to all elements and attributes +Some conventions and rules apply generally to all elements and attributes in the manifest: </p> <dl> <dt><b>Elements</b></dt> -<dd>Only the +<dd>Only the <code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code> and -<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> -elements are required, they each must be present and can occur only once. -Most of the others can occur many times or not at all — although at -least some of them must be present for the manifest to accomplish anything +<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> +elements are required, they each must be present and can occur only once. +Most of the others can occur many times or not at all — although at +least some of them must be present for the manifest to accomplish anything meaningful. <p> -If an element contains anything at all, it contains other elements. +If an element contains anything at all, it contains other elements. All values are set through attributes, not as character data within an element. </p> <p> Elements at the same level are generally not ordered. For example, -<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>, -<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>, and -<code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code> -elements can be intermixed in any sequence. (An -<code><a href="{@docRoot}guide/topics/manifest/activity-alias-element.html"><activity-alias></a></code> -element is the exception to this rule: It must follow the -<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code> -it is an alias for.) +<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>, +<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>, and +<code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code> +elements can be intermixed in any sequence. There are two key exceptions to this +rule, however: +<ul> + <li> + An <code><a href="{@docRoot}guide/topics/manifest/activity-alias-element.html"><activity-alias></a></code> + element must follow the + <code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code> + it is an alias for. + </li> + <li> + The <code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> + element must be the last element inside the + <code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code> + element. In other words, the <code></application></code> closing tag + must appear immediately before the <code></manifest></code> closing + tag. + </li> </p></dd> <dt><b>Attributes</b></dt> -<dd>In a formal sense, all attributes are optional. However, there are some -that must be specified for an element to accomplish its purpose. Use the -documentation as a guide. For truly optional attributes, it mentions a default +<dd>In a formal sense, all attributes are optional. However, there are some +that must be specified for an element to accomplish its purpose. Use the +documentation as a guide. For truly optional attributes, it mentions a default value or states what happens in the absence of a specification. -<p>Except for some attributes of the root -<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code> -element, all attribute names begin with an {@code android:} prefix — -for example, {@code android:alwaysRetainTaskState}. Because the prefix is -universal, the documentation generally omits it when referring to attributes +<p>Except for some attributes of the root +<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code> +element, all attribute names begin with an {@code android:} prefix — +for example, {@code android:alwaysRetainTaskState}. Because the prefix is +universal, the documentation generally omits it when referring to attributes by name.</p></dd> <dt><b>Declaring class names</b></dt> -<dd>Many elements correspond to Java objects, including elements for the -application itself (the -<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> -element) and its principal components — activities -(<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>), -services -(<code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code>), -broadcast receivers -(<code><a href="{@docRoot}guide/topics/manifest/receiver-element.html"><receiver></a></code>), -and content providers -(<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>). +<dd>Many elements correspond to Java objects, including elements for the +application itself (the +<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> +element) and its principal components — activities +(<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>), +services +(<code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code>), +broadcast receivers +(<code><a href="{@docRoot}guide/topics/manifest/receiver-element.html"><receiver></a></code>), +and content providers +(<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>). <p> -If you define a subclass, as you almost always would for the component classes -({@link android.app.Activity}, {@link android.app.Service}, -{@link android.content.BroadcastReceiver}, and {@link android.content.ContentProvider}), -the subclass is declared through a {@code name} attribute. The name must include -the full package designation. +If you define a subclass, as you almost always would for the component classes +({@link android.app.Activity}, {@link android.app.Service}, +{@link android.content.BroadcastReceiver}, and {@link android.content.ContentProvider}), +the subclass is declared through a {@code name} attribute. The name must include +the full package designation. For example, an {@link android.app.Service} subclass might be declared as follows: </p> @@ -239,12 +251,12 @@ For example, an {@link android.app.Service} subclass might be declared as follow </manifest></pre> <p> -However, as a shorthand, if the first character of the string is a period, the -string is appended to the application's package name (as specified by the -<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code> -element's -<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html#package">package</a></code> -attribute). The following assignment is the same as the one above: +However, as a shorthand, if the first character of the string is a period, the +string is appended to the application's package name (as specified by the +<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code> +element's +<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html#package">package</a></code> +attribute). The following assignment is the same as the one above: </p> <pre><manifest package="com.example.project" . . . > @@ -257,13 +269,13 @@ attribute). The following assignment is the same as the one above: </manifest></pre> <p> -When starting a component, Android creates an instance of the named subclass. +When starting a component, Android creates an instance of the named subclass. If a subclass isn't specified, it creates an instance of the base class. </p></dd> <dt><b>Multiple values</b></dt> -<dd>If more than one value can be specified, the element is almost always -repeated, rather than listing multiple values within a single element. +<dd>If more than one value can be specified, the element is almost always +repeated, rather than listing multiple values within a single element. For example, an intent filter can list several actions: <pre><intent-filter . . . > @@ -274,24 +286,24 @@ For example, an intent filter can list several actions: </intent-filter></pre></dd> <dt><b>Resource values</b></dt> -<dd>Some attributes have values that can be displayed to users — for -example, a label and an icon for an activity. The values of these attributes -should be localized and therefore set from a resource or theme. Resource +<dd>Some attributes have values that can be displayed to users — for +example, a label and an icon for an activity. The values of these attributes +should be localized and therefore set from a resource or theme. Resource values are expressed in the following format,</p> <p style="margin-left: 2em">{@code @[<i>package</i>:]<i>type</i>/<i>name</i>}</p> <p> -where the <i>package</i> name can be omitted if the resource is in the same package -as the application, <i>type</i> is a type of resource — such as "string" or -"drawable" — and <i>name</i> is the name that identifies the specific resource. +where the <i>package</i> name can be omitted if the resource is in the same package +as the application, <i>type</i> is a type of resource — such as "string" or +"drawable" — and <i>name</i> is the name that identifies the specific resource. For example: </p> <pre><activity android:icon="@drawable/smallPic" . . . ></pre> <p> -Values from a theme are expressed in a similar manner, but with an initial '{@code ?}' +Values from a theme are expressed in a similar manner, but with an initial '{@code ?}' rather than '{@code @}': </p> @@ -299,8 +311,8 @@ rather than '{@code @}': </p></dd> <dt><b>String values</b></dt> -<dd>Where an attribute value is a string, double backslashes ('{@code \\}') -must be used to escape characters — for example, '{@code \\n}' for +<dd>Where an attribute value is a string, double backslashes ('{@code \\}') +must be used to escape characters — for example, '{@code \\n}' for a newline or '{@code \\uxxxx}' for a Unicode character.</dd> </dl> @@ -308,7 +320,7 @@ a newline or '{@code \\uxxxx}' for a Unicode character.</dd> <h2 id="filef">File Features</h2> <p> -The following sections describe how some Android features are reflected +The following sections describe how some Android features are reflected in the manifest file. </p> @@ -316,23 +328,23 @@ in the manifest file. <h3 id="ifs">Intent Filters</h3> <p> -The core components of an application (its activities, services, and broadcast -receivers) are activated by <i>intents</i>. An intent is a -bundle of information (an {@link android.content.Intent} object) describing a -desired action — including the data to be acted upon, the category of -component that should perform the action, and other pertinent instructions. -Android locates an appropriate component to respond to the intent, launches -a new instance of the component if one is needed, and passes it the +The core components of an application (its activities, services, and broadcast +receivers) are activated by <i>intents</i>. An intent is a +bundle of information (an {@link android.content.Intent} object) describing a +desired action — including the data to be acted upon, the category of +component that should perform the action, and other pertinent instructions. +Android locates an appropriate component to respond to the intent, launches +a new instance of the component if one is needed, and passes it the Intent object. </p> <p> -Components advertise their capabilities — the kinds of intents they can -respond to — through <i>intent filters</i>. Since the Android system -must learn which intents a component can handle before it launches the component, -intent filters are specified in the manifest as -<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code> -elements. A component may have any number of filters, each one describing +Components advertise their capabilities — the kinds of intents they can +respond to — through <i>intent filters</i>. Since the Android system +must learn which intents a component can handle before it launches the component, +intent filters are specified in the manifest as +<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code> +elements. A component may have any number of filters, each one describing a different capability. </p> @@ -344,9 +356,9 @@ filters. </p> <p> -For information on how Intent objects are tested against intent filters, -see a separate document, -<a href="{@docRoot}guide/components/intents-filters.html">Intents +For information on how Intent objects are tested against intent filters, +see a separate document, +<a href="{@docRoot}guide/components/intents-filters.html">Intents and Intent Filters</a>. </p> @@ -354,42 +366,42 @@ and Intent Filters</a>. <h3 id="iconlabel">Icons and Labels</h3> <p> -A number of elements have {@code icon} and {@code label} attributes for a -small icon and a text label that can be displayed to users. Some also have a -{@code description} attribute for longer explanatory text that can also be -shown on-screen. For example, the +A number of elements have {@code icon} and {@code label} attributes for a +small icon and a text label that can be displayed to users. Some also have a +{@code description} attribute for longer explanatory text that can also be +shown on-screen. For example, the <code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code> -element has all three of these attributes, so that when the user is asked whether -to grant the permission to an application that has requested it, an icon representing -the permission, the name of the permission, and a description of what it +element has all three of these attributes, so that when the user is asked whether +to grant the permission to an application that has requested it, an icon representing +the permission, the name of the permission, and a description of what it entails can all be presented to the user. </p> <p> -In every case, the icon and label set in a containing element become the default -{@code icon} and {@code label} settings for all of the container's subelements. -Thus, the icon and label set in the -<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> -element are the default icon and label for each of the application's components. -Similarly, the icon and label set for a component — for example, an -<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code> -element — are the default settings for each of the component's -<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code> +In every case, the icon and label set in a containing element become the default +{@code icon} and {@code label} settings for all of the container's subelements. +Thus, the icon and label set in the +<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> +element are the default icon and label for each of the application's components. +Similarly, the icon and label set for a component — for example, an +<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code> +element — are the default settings for each of the component's +<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code> elements. If an -<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> -element sets a label, but an activity and its intent filter do not, -the application label is treated as the label for both the activity and +<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code> +element sets a label, but an activity and its intent filter do not, +the application label is treated as the label for both the activity and the intent filter. </p> <p> -The icon and label set for an intent filter are used to represent a component +The icon and label set for an intent filter are used to represent a component whenever the component is presented to the user as fulfilling the function -advertised by the filter. For example, a filter with -"{@code android.intent.action.MAIN}" and -"{@code android.intent.category.LAUNCHER}" settings advertises an activity +advertised by the filter. For example, a filter with +"{@code android.intent.action.MAIN}" and +"{@code android.intent.category.LAUNCHER}" settings advertises an activity as one that initiates an application — that is, as -one that should be displayed in the application launcher. The icon and label +one that should be displayed in the application launcher. The icon and label set in the filter are therefore the ones displayed in the launcher. </p> @@ -397,14 +409,14 @@ set in the filter are therefore the ones displayed in the launcher. <h3 id="perms">Permissions</h3> <p> -A <i>permission</i> is a restriction limiting access to a part of the code -or to data on the device. The limitation is imposed to protect critical -data and code that could be misused to distort or damage the user experience. +A <i>permission</i> is a restriction limiting access to a part of the code +or to data on the device. The limitation is imposed to protect critical +data and code that could be misused to distort or damage the user experience. </p> <p> -Each permission is identified by a unique label. Often the label indicates -the action that's restricted. For example, here are some permissions defined +Each permission is identified by a unique label. Often the label indicates +the action that's restricted. For example, here are some permissions defined by Android: </p> @@ -418,26 +430,26 @@ A feature can be protected by at most one permission. </p> <p> -If an application needs access to a feature protected by a permission, -it must declare that it requires that permission with a -<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code> -element in the manifest. Then, when the application is installed on -the device, the installer determines whether or not to grant the requested -permission by checking the authorities that signed the application's -certificates and, in some cases, asking the user. -If the permission is granted, the application is able to use the protected -features. If not, its attempts to access those features will simply fail -without any notification to the user. +If an application needs access to a feature protected by a permission, +it must declare that it requires that permission with a +<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code> +element in the manifest. Then, when the application is installed on +the device, the installer determines whether or not to grant the requested +permission by checking the authorities that signed the application's +certificates and, in some cases, asking the user. +If the permission is granted, the application is able to use the protected +features. If not, its attempts to access those features will simply fail +without any notification to the user. </p> <p> -An application can also protect its own components (activities, services, -broadcast receivers, and content providers) with permissions. It can employ -any of the permissions defined by Android (listed in -{@link android.Manifest.permission android.Manifest.permission}) or declared -by other applications. Or it can define its own. A new permission is declared -with the -<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code> +An application can also protect its own components (activities, services, +broadcast receivers, and content providers) with permissions. It can employ +any of the permissions defined by Android (listed in +{@link android.Manifest.permission android.Manifest.permission}) or declared +by other applications. Or it can define its own. A new permission is declared +with the +<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code> element. For example, an activity could be protected as follows: </p> @@ -457,43 +469,43 @@ element. For example, an activity could be protected as follows: </pre> <p> -Note that, in this example, the {@code DEBIT_ACCT} permission is not only -declared with the -<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code> -element, its use is also requested with the -<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code> -element. Its use must be requested in order for other components of the -application to launch the protected activity, even though the protection -is imposed by the application itself. +Note that, in this example, the {@code DEBIT_ACCT} permission is not only +declared with the +<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code> +element, its use is also requested with the +<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code> +element. Its use must be requested in order for other components of the +application to launch the protected activity, even though the protection +is imposed by the application itself. </p> <p> -If, in the same example, the {@code permission} attribute was set to a -permission declared elsewhere -(such as {@code android.permission.CALL_EMERGENCY_NUMBERS}, it would not -have been necessary to declare it again with a -<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code> -element. However, it would still have been necessary to request its use with -<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>. +If, in the same example, the {@code permission} attribute was set to a +permission declared elsewhere +(such as {@code android.permission.CALL_EMERGENCY_NUMBERS}, it would not +have been necessary to declare it again with a +<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code> +element. However, it would still have been necessary to request its use with +<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>. </p> <p> -The -<code><a href="{@docRoot}guide/topics/manifest/permission-tree-element.html"><permission-tree></a></code> -element declares a namespace for a group of permissions that will be defined in -code. And +The +<code><a href="{@docRoot}guide/topics/manifest/permission-tree-element.html"><permission-tree></a></code> +element declares a namespace for a group of permissions that will be defined in +code. And <code><a href="{@docRoot}guide/topics/manifest/permission-group-element.html"><permission-group></a></code> -defines a label for a set of permissions (both those declared in the manifest with -<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code> -elements and those declared elsewhere). It affects only how the permissions are -grouped when presented to the user. The +defines a label for a set of permissions (both those declared in the manifest with +<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code> +elements and those declared elsewhere). It affects only how the permissions are +grouped when presented to the user. The <code><a href="{@docRoot}guide/topics/manifest/permission-group-element.html"><permission-group></a></code> -element does not specify which permissions belong to the group; +element does not specify which permissions belong to the group; it just gives the group a name. A permission is placed in the group by assigning the group name to the -<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code> -element's -<code><a href="{@docRoot}guide/topics/manifest/permission-element.html#pgroup">permissionGroup</a></code> +<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code> +element's +<code><a href="{@docRoot}guide/topics/manifest/permission-element.html#pgroup">permissionGroup</a></code> attribute. </p> @@ -501,17 +513,17 @@ attribute. <h3 id="libs">Libraries</h3> <p> -Every application is linked against the default Android library, which -includes the basic packages for building applications (with common classes -such as Activity, Service, Intent, View, Button, Application, ContentProvider, +Every application is linked against the default Android library, which +includes the basic packages for building applications (with common classes +such as Activity, Service, Intent, View, Button, Application, ContentProvider, and so on). </p> <p> -However, some packages reside in their own libraries. If your application -uses code from any of these packages, it must explicitly asked to be linked -against them. The manifest must contain a separate -<code><a href="{@docRoot}guide/topics/manifest/uses-library-element.html"><uses-library></a></code> -element to name each of the libraries. (The library name can be found in the +However, some packages reside in their own libraries. If your application +uses code from any of these packages, it must explicitly asked to be linked +against them. The manifest must contain a separate +<code><a href="{@docRoot}guide/topics/manifest/uses-library-element.html"><uses-library></a></code> +element to name each of the libraries. (The library name can be found in the documentation for the package.) </p> diff --git a/docs/html/guide/topics/manifest/uses-feature-element.jd b/docs/html/guide/topics/manifest/uses-feature-element.jd index b9d0082e478a..5d163c0d5d56 100755 --- a/docs/html/guide/topics/manifest/uses-feature-element.jd +++ b/docs/html/guide/topics/manifest/uses-feature-element.jd @@ -77,7 +77,7 @@ application describe the device-variable features that it uses.</p> <p>The set of available features that your application declares corresponds to the set of feature constants made available by the Android {@link android.content.pm.PackageManager}, which are listed for -convenience in the <a href="#features-reference">Features Reference</a> tables +convenience in the <a href="#features-reference">Features Reference</a> sections at the bottom of this document. <p>You must specify each feature in a separate <code><uses-feature></code> @@ -131,17 +131,27 @@ device compatibility.</p> <dd> <dl class="attr"> + <dt> + <a name="name"></a><code>android:name</code> + </dt> + + <dd> + Specifies a single hardware or software feature used by the application, as + a descriptor string. Valid attribute values are listed in the <a href= + "#hw-features">Hardware features</a> and <a href="#sw-features">Software + features</a> sections. These attribute values are case-sensitive. + </dd> - <dt><a name="name"></a><code>android:name</code></dt> - <dd>Specifies a single hardware or software feature used by the application, -as a descriptor string. Valid descriptor values are listed in the <a -href="#hw-features">Hardware features</a> and <a href="#sw-features">Software -features</a> tables, below. Descriptor string values are case-sensitive.</dd> - - <dt><a name="required"></a><code>android:required</code></dt> <!-- added in api level 5 --> - <dd>Boolean value that indicates whether the application requires - the feature specified in <code>android:name</code>. + <dt> + <a name="required"></a><code>android:required</code> + </dt> + <!-- added in api level 5 --> + <dd> + Boolean value that indicates whether the application requires the feature + specified in <code>android:name</code>. + </dd> +</dl> <ul> <li>When you declare <code>android:required="true"</code> for a feature, you are specifying that the application <em>cannot function, or is not @@ -163,7 +173,7 @@ feature</em>, if necessary. </li> <dd>The OpenGL ES version required by the application. The higher 16 bits represent the major number and the lower 16 bits represent the minor number. For example, to specify OpenGL ES version 2.0, you would set the value as -"0x00020000", or to specify OpenGL ES 3.0, you would set the value as "0x00030000". +"0x00020000", or to specify OpenGL ES 3.2, you would set the value as "0x00030002". <p>An application should specify at most one <code>android:glEsVersion</code> attribute in its manifest. If it specifies more than one, the @@ -184,8 +194,8 @@ only specify the numerically lowest version of OpenGL ES that it requires. (It can check at run-time whether a higher level of OpenGL ES is available.)</p> <p>For more information about using OpenGL ES, including how to check the supported OpenGL ES -version at runtime, see the <a href="{@docRoot}guide/topics/graphics/opengl.html">OpenGL ES</a> -API guide.</p> +version at runtime, see the <a href="{@docRoot}guide/topics/graphics/opengl.html">OpenGL ES +API guide</a>.</p> </dd> </dl> @@ -229,7 +239,7 @@ a device reports the features it supports as read-only system properties.</li> <p>To ensure an accurate comparison of features, the Android Package Manager provides a shared set of feature constants that both applications and devices use to declare feature requirements and support. The available feature constants -are listed in the <a href="#features-reference">Features Reference</a> tables at +are listed in the <a href="#features-reference">Features Reference</a> sections at the bottom of this document, and in the class documentation for {@link android.content.pm.PackageManager}.</p> @@ -362,8 +372,8 @@ the feature as shown below.</p> <p class="caution">It's important to understand that the permissions that you request in <code><uses-permission></code> elements can directly affect how Google Play filters your application. The reference section <a -href="#permissions">Permissions that Imply Feature Requirements</a>, -below, lists the full set of permissions that imply feature requirements and +href="#permissions">Permissions that Imply Feature Requirements</a> lists the +full set of permissions that imply feature requirements and therefore trigger filtering.</p> <h3 id="bt-permission-handling">Special handling for Bluetooth feature</h3> @@ -532,493 +542,1159 @@ locales: '--_--' densities: '160' </pre> +<h2 id="features-reference"> + Features Reference +</h2> -<h2 id=features-reference>Features Reference</h2> - -<p>The tables below provide reference information about hardware and software -features and the permissions that can imply them on Google Play. </p> - -<h3 id="hw-features">Hardware features</h3> - -<p>The table below describes the hardware feature descriptors supported by the -most current platform release. To signal that your application uses or requires -a hardware feature, declare each value in a <code>android:name</code> attribute -in a separate <code><uses-feature></code> element. </p> - - <table> - <tr> - <th>Feature Type</th> - <th>Feature Descriptor</th> - <th style="min-width:170px">Description</th> - <th>Comments</th> - </tr> - <tr> - <td rowspan="4">Audio</td> - <td><code>android.hardware.audio.low_latency</code></td> - <td>The application uses a low-latency audio pipeline on the device and - is sensitive to delays or lag in sound input or output.</td> - <td></td> - </tr> - <tr> - <td><code>android.hardware.audio.pro</code></td> - <td>The application uses high-end audio functionality and performance.</td> - <td></td> - </tr> - <tr> - <td><code>android.hardware.microphone</code></td> - <td>The application records audio via a microphone.</td> - <td></td> - </tr> - </tr> - <td><code>android.hardware.output</code></td> - <td>The application produces at least one form of audio output, such as speakers, audio jack - or streaming over bluetooth.</td> - <td></td> - </tr> - <tr> - <td rowspan="2">Bluetooth</td> - <td><code>android.hardware.bluetooth</code></td> - <td>The application uses Bluetooth radio features in the device.</td> - <td></td> - </tr> - <tr> - <td><code>android.hardware.bluetooth_le</code></td> - <td>The application uses Bluetooth Low Energy radio features in the device.</td> - <td></td> - </tr> - <tr> - <td rowspan="6">Camera</td> - <td><code>android.hardware.camera</code></td> - <td>The application uses the device's back-facing (main) camera.</td> - <td>Devices with only a front-facing camera do not list this feature, so - the <code>android.hardware.camera.any</code> feature should be used - instead if a camera facing any direction is acceptable for the - application.</td> - </tr> -<tr> - <td><code>android.hardware.camera.autofocus</code></td> - <td>Subfeature. The application uses the device camera's autofocus capability.</td> - <td rowspan="3">These subfeatures implicitly declare the -<code>android.hardware.camera</code> parent feature, unless declared with -<code>android:required="false"</code>.</td> -</tr> -<tr> - <td><code>android.hardware.camera.flash</code></td> - <td>Subfeature. The application uses the device camera's flash.</td> -</tr> -<tr> - <td><code>android.hardware.camera.front</code></td> - <td>Subfeature. The application uses a front-facing camera on the device.</td> -</tr> -<tr> - <td><code>android.hardware.camera.any</code></td> - <td>The application uses at least one camera facing in any direction, or an -external camera device if one is connected. Use this in preference to -<code>android.hardware.camera</code> if a back-facing camera is not required. - </td> -</tr> -<tr> - <td><code>android.hardware.camera.external</code></td> - <td>The application uses an external camera device if one is connected.</td> -</tr> -<tr> - <td><code>android.hardware.camera.level.full</code></td> - <td>The application uses a camera device with <code>FULL</code>-level support.</td> -</tr> -<tr> - <td><code>android.hardware.camera.capability.manual_sensor</code></td> - <td>The application uses a a camera device with the <code>MANUAL_SENSOR</code> capability.</td> -</tr> -<tr> - <td><code>android.hardware.camera.capability.manual_post_processing</code></td> - <td>The application uses a a camera device with the <code>MANUAL_POST_PROCESSING</code> capability.</td> -</tr> -<tr> - <td><code>android.hardware.camera.capability.raw</code></td> - <td>The application uses a a camera device with the <code>RAW</code> capability.</td> -</tr> +<p> + The following sections provide reference information about hardware features, + software features, and sets of permissions that imply specific feature + requirements. +</p> -<tr> - <td>Infrared</td> - <td><code>android.hardware.consumerir</code></td> - <td>The application uses the consumer IR capabilities on the device.</td> - <td></td> -</tr> +<h3 id="hw-features"> + Hardware features +</h3> + +<p> + This section presents the hardware features supported by the most current + platform release. To indicate that your app uses or requires a hardware + feature, declare the corresponding value (beginning with + <code>"android.hardware"</code>) in an <code>android:name</code> attribute. + Each time you declare a hardware feature, use a separate + <code><uses-feature></code> element. +</p> -<tr> - <td rowspan="3">Location</td> - <td><code>android.hardware.location</code></td> - <td>The application uses one or more features on the device for determining -location, such as GPS location, network location, or cell location.</td> - <td></td> -</tr> -<tr> - <td><code>android.hardware.location.network</code></td> - <td>Subfeature. The application uses coarse location coordinates obtained from -a network-based geolocation system supported on the device.</td> - <td rowspan="2">These subfeatures implicitly declare the -<code>android.hardware.location</code> parent feature, unless declared with -<code>android:required="false"</code>. </td> -</tr> -<tr> - <td><code>android.hardware.location.gps</code></td> - <td>Subfeature. The application uses precise location coordinates obtained -from a Global Positioning System receiver on the device. </td> -</tr> -<tr> - <td>Microphone</td> - <td><code>android.hardware.microphone</code></td> - <td>The application uses a microphone on the device. - </td> - <td></td> -</tr> -<tr> - <td rowspan="2">NFC</td> - <td><code>android.hardware.nfc</td> - <td>The application uses Near Field Communications radio features in the device.</td> - <td></td> -</tr> -<tr> - <td><code>android.hardware.nfc.hce</code></td> - <td>The application uses the NFC card emulation feature in the device.</td> - <td></td> -</tr> -<tr> - <td rowspan="8">Sensors</td> - <td><code>android.hardware.sensor.accelerometer</code></td> - <td>The application uses motion readings from an accelerometer on the -device.</td> - <td></td> -</tr> -<tr> - <td><code>android.hardware.sensor.barometer</code></td> - <td>The application uses the device's barometer.</td> - <td></td> -</tr> -<tr> - <td><code>android.hardware.sensor.compass</code></td> - <td>The application uses directional readings from a magnetometer (compass) on -the device.</td> - <td></td> -</tr> -<tr> - <td><code>android.hardware.sensor.gyroscope</code></td> - <td>The application uses the device's gyroscope sensor.</td> - <td></td> -</tr> -<tr> - <td><code>android.hardware.sensor.light</code></td> - <td>The application uses the device's light sensor.</td> - <td></td> -</tr> -<tr> - <td><code>android.hardware.sensor.proximity</code></td> - <td>The application uses the device's proximity sensor.</td> - <td></td> -</tr> -<tr> - <td><code>android.hardware.sensor.stepcounter</code></td> - <td>The application uses the device's step counter.</td> - <td></td> -</tr> -<tr> - <td><code>android.hardware.sensor.stepdetector</code></td> - <td>The application uses the device's step detector.</td> - <td></td> -</tr> +<h4 id="audio-hw-features"> + Audio hardware features +</h4> -<tr> - <td rowspan="2">Screen</td> - <td><code>android.hardware.screen.landscape</code></td> - <td>The application requires landscape orientation.</td> - <td rowspan="2"> - <p>For example, if your app requires portrait orientation, you should declare -<code><uses-feature android:name="android.hardware.screen.portrait"/></code> so that only devices -that support portrait orientation (whether always or by user choice) can install your app. If your -application <em>supports</em> both orientations, then you don't need to declare either.</p> - <p>Both orientations are assumed <em>not required</em>, by default, so your app may be installed -on devices that support one or both orientations. However, if any of your activities request that -they run in a specific orientation, using the <a -href="{@docRoot}guide/topics/manifest/activity-element.html#screen">{@code -android:screenOrientation}</a> attribute, then this also declares that the application requires that -orientation. For example, if you declare <a -href="{@docRoot}guide/topics/manifest/activity-element.html#screen">{@code -android:screenOrientation}</a> with either {@code "landscape"}, {@code "reverseLandscape"}, or -{@code "sensorLandscape"}, then your application will be available only to devices that support -landscape orientation. As a best practice, you should still declare your requirement for this -orientation using a {@code <uses-feature>} element. If you declare an orientation for your -activity using <a href="{@docRoot}guide/topics/manifest/activity-element.html#screen">{@code -android:screenOrientation}</a>, but don't actually <em>require</em> it, you can disable the -requirement by declaring the orientation with a {@code <uses-feature>} element and include -{@code android:required="false"}.</p> - <p>For backwards compatibility, any device running a platform version that supports only API -level 12 or lower is assumed to support both landscape and portrait.</p> - </td> -</tr> -<tr> - <td><code>android.hardware.screen.portrait</code></td> - <td>The application requires portrait orientation.</td> -</tr> +<dl> + <dt> + <code>android.hardware.audio.low_latency</code> + </dt> -<tr> - <td rowspan="3">Telephony</td> - <td><code>android.hardware.telephony</code></td> - <td>The application uses telephony features on the device, such as telephony -radio with data communication services.</td> - <td></td> -</tr> -<tr> - <td><code>android.hardware.telephony.cdma</code></td> - <td>Subfeature. The application uses CDMA telephony radio features on the -device. </td> - <td rowspan="2">These subfeatures implicitly declare the -<code>android.hardware.telephony</code> parent feature, unless declared with -<code>android:required="false"</code>. </td> -</tr> -<tr> - <td><code>android.hardware.telephony.gsm</code></td> - <td>Subfeature. The application uses GSM telephony radio features on the -device.</td> -</tr> + <dd> + The app uses the device's low-latency audio pipeline, which reduces lag and + delays when processing sound input or output. + </dd> -<tr> - <td>Television</td> - <td><code>android.hardware.type.television</code></td> - <td>The application is designed for a television user experience.</td> - <td>This feature defines "television" to be a typical living room television experience: - displayed on a big screen, where the user is sitting far away and the dominant form of - input is something like a d-pad, and generally not through touch or a - mouse/pointer-device.</td> -</tr> + <dt> + <code>android.hardware.audio.output</code> + </dt> -<tr> - <td rowspan="7">Touchscreen</td> - <td><code>android.hardware.faketouch</code></td> - <td>The application uses basic touch interaction events, such as "click down", "click -up", and drag.</td> - <td><p>When declared as required, this indicates that the application is compatible with a device -only if it offers an emulated touchscreen ("fake touch" interface), or better. A device that offers -a fake touch interface provides a user input system that emulates a subset of touchscreen -capabilities. For example, a mouse or remote control that drives an on-screen cursor provides a fake -touch interface. If your application requires basic point and click interaction (in other -words, it won't work with <em>only</em> a d-pad controller), you should declare this feature. -Because this is the minimum level of touch interaction, your app will also be compatible with -devices that offer more complex touch interfaces.</p> - <p class="note"><strong>Note:</strong> Because applications require the {@code -android.hardware.touchscreen} feature by default, if you want your application to be available to -devices that provide a fake touch interface, you must also explicitly declare that a touch screen is -<em>not</em> required by declaring <code><uses-feature -android:name="android.hardware.touchscreen" <strong>android:required="false"</strong> -/></code></p></td> -</tr> + <dd> + The app transmits sound using the device's speakers, audio jack, Bluetooth + streaming capabilities, or a similar mechanism. + </dd> -<tr> - <td><code>android.hardware.faketouch.multitouch.distinct</code></td> - <td>The application performs distinct tracking of two or more "fingers" on a fake touch -interface. This is a superset of the faketouch feature.</td> - <td><p>When declared as required, this indicates that the application is compatible with a device -only if it supports touch emulation for events that supports distinct tracking of two or more -fingers, or better.</p> - <p>Unlike the distinct multitouch defined by {@code -android.hardware.touchscreen.multitouch.distinct}, input devices that support distinct multi-touch -with a fake touch interface will not support all two-finger gestures, because the input is -being transformed to cursor movement on the screen. That is, single finger gestures on such a device -move a cursor; two-finger swipes will result in single-finger touch events; other two-finger -gestures will result in the corresponding two-finger touch event. An example device that supports -distinct multi-touch with a fake touch interface is one that provides a trackpad for cursor movement -which also supports two or more fingers.</p></td> -</tr> + <dt> + <code>android.hardware.audio.pro</code> + </dt> -<tr> - <td><code>android.hardware.faketouch.multitouch.jazzhand</code></td> - <td>The application performs distinct tracking of five or more "fingers" on a fake touch -interface. This is a superset of the faketouch feature.</td> - <td><p>When declared as required, this indicates that the application is compatible with a device -only if it supports touch emulation for events that supports distinct tracking of five or more -fingers.</p> - <p>Unlike the distinct multitouch defined by {@code -android.hardware.touchscreen.multitouch.jazzhand}, input devices that support jazzhand multi-touch -with a fake touch interface will not support all five-finger gestures, because the input is being -transformed to cursor movement on the screen. That is, single finger gestures on such a device move -a cursor; multi-finger gestures will result in single-finger touch events; other multi-finger -gestures will result in the corresponding multi-finger touch event. An example device that supports -distinct multi-touch with a fake touch interface is one that provides a trackpad for cursor movement -which also supports five or more fingers.</p></td> -</tr> + <dd> + The app uses the device's high-end audio functionality and performance + capabilities. + </dd> -<tr> - <td><code>android.hardware.touchscreen</code></td> - <td>The application uses touchscreen capabilities for gestures that are more interactive -than basic touch events, such as a fling. This is a superset of the basic faketouch feature.</td> - <td><p>By default, your application requires this. As such, your application is <em>not</em> -available to devices that provide only an emulated touch interface ("fake touch"), by default. If -you want your application available to devices that provide a fake touch interface (or even devices -that provide only a d-pad controller), you must explicitly declare that a touch screen is not -required, by declaring {@code android.hardware.touchscreen} with {@code android:required="false"}. -You should do so even if your application uses—but does not <em>require</em>—a real -touch screen interface.</p> -<p>If your application <em>does require</em> a touch interface (in order to perform touch -gestures such as a fling), then you don't need to do anything, because this is required by default. -However, it's best if you explicitly declare all features used by your application, so you should -still declare this if your app uses it.</p> - <p>If you require more complex touch interaction, such as multi-finger gestures, you -should declare the advanced touch screen features below.</p></td> -</tr> -<tr> - <td><code>android.hardware.touchscreen.multitouch</code></td> - <td>The application uses basic two-point multitouch capabilities on the device -screen, such as for pinch gestures, but does not need to track touches independently. This -is a superset of touchscreen feature.</td> - <td>This implicitly declares the <code>android.hardware.touchscreen</code> parent feature, unless -declared with <code>android:required="false"</code>. </td> -</tr> -<tr> - <td><code>android.hardware.touchscreen.multitouch.distinct</code></td> - <td>Subfeature. The application uses advanced multipoint multitouch -capabilities on the device screen, such as for tracking two or more points fully -independently. This is a superset of multitouch feature.</td> - <td rowspan="2">This implicitly declares the <code>android.hardware.touchscreen.multitouch</code> -parent feature, unless declared with <code>android:required="false"</code>. </td> -</tr> -<tr> - <td><code>android.hardware.touchscreen.multitouch.jazzhand</code></td> - <td>The application uses advanced multipoint multitouch -capabilities on the device screen, for tracking up to five points fully -independently. This is a superset of distinct multitouch feature.</td> -</tr> + <dt> + <code>android.hardware.microphone</code> + </dt> -<tr> - <td rowspan="2">USB</td> - <td><code>android.hardware.usb.host</code></td> - <td>The application uses USB host mode features (behaves as the host and connects to USB -devices).</td> - <td></td> -</tr> + <dd> + The app records audio using the device's microphone. + </dd> +</dl> -<tr> - <td><code>android.hardware.usb.accessory</code></td> - <td>The application uses USB accessory features (behaves as the USB device and connects to USB -hosts).</td> - <td></td> -</tr> +<h4 id="bluetooth-hw-features"> + Bluetooth hardware features +</h4> -<tr> - <td rowspan="2">Wi-Fi</td> - <td><code>android.hardware.wifi</code></td> - <td>The application uses 802.11 networking (Wi-Fi) features on the device.</td> - <td></td> -</tr> -<tr> - <td><code>android.hardware.wifi.direct</code></td> - <td>The application uses the Wi-Fi Direct networking features on the device.</td> -</tr> +<dl> + <dt> + <code>android.hardware.bluetooth</code> + </dt> - </table> + <dd> + The app uses the device's Bluetooth features, usually to communicate with + other Bluetooth-enabled devices. + </dd> -<h3 id="sw-features">Software features</h3> + <dt> + <code>android.hardware.bluetooth_le</code> + </dt> -<p>The table below describes the software feature descriptors supported by the -most current platform release. To signal that your application uses or requires -a software feature, declare each value in a <code>android:name</code> attribute -in a separate <code><uses-feature></code> element. </p> + <dd> + The app uses the device's Bluetooth Low Energy radio features. + </dd> +</dl> +<h4 id="camera-hw-features"> + Camera hardware features +</h4> - <table> -<tr> - <th>Feature</th> - <th>Attribute Value</th> - <th>Description</th> -</tr> -<tr> - <td>App Widgets</td> - <td><code>android.software.app_widgets</code></td> - <td>The application uses or provides App Widgets and should be installed only on devices - that include a Home screen or similar location where users can embed App Widgets.</td> -</tr> -<tr> - <td>Device Management</td> - <td><code>android.software.device_admin</code></td> - <td>The application uses device policy enforcement via device administrators.</td> -</tr> -<tr> - <td>Home Screen</td> - <td><code>android.software.home_screen</code></td> - <td>The application behaves as a Home screen replacement and should be installed only on - devices that support third-party Home screen apps.</td> -</tr> -<tr> - <td>Input Method</td> - <td><code>android.software.input_methods</code></td> - <td>The application provides a custom input method and should be installed only on devices that - support third-party input methods.</td> -</tr> -<tr> - <td>Live Wallpaper</td> - <td><code>android.software.live_wallpaper</code></td> - <td>The application uses or provides Live Wallpapers and should be installed only on devices that - support Live Wallpapers.</td> -</tr> -<tr> - <td>MIDI</td> - <td><code>android.software.midi</code></td> - <td>The application connects to musical instruments or outputs sound - using the Musical Instrument Digital Interface (MIDI) protocol.</td> -</tr> -<tr> - <td rowspan="2">SIP/VOIP</td> - <td><code>android.software.sip</code></td> - <td>The application uses SIP service on the device and should be installed only on devices that - support SIP. - </td> -</tr> -<tr> - <td><code>android.software.sip.voip</code></td> - <td><p>Subfeature. The application uses SIP-based VOIP service on the device. - <p>This subfeature implicitly declares the <code>android.software.sip</code> parent feature, -unless declared with <code>android:required="false"</code>.</td> -</tr> - </table> - - -<h3 id="permissions">Permissions that Imply Feature Requirements</h3> - -<p>Some feature constants listed in the tables above were made available to -applications <em>after</em> the corresponding API; for example, the -<code>android.hardware.bluetooth</code> feature was added in Android 2.2 (API -level 8), but the bluetooth API that it refers to was added in Android 2.0 (API -level 5). Because of this, some apps were able to use the API before they had -the ability to declare that they require the API via the -<code><uses-feature></code> system. </p> - -<p>To prevent those apps from being made available unintentionally, Google -Play assumes that certain hardware-related permissions indicate that the -underlying hardware features are required by default. For instance, applications -that use Bluetooth must request the <code>BLUETOOTH</code> permission in a -<code><uses-permission></code> element — for legacy apps, Google -Play assumes that the permission declaration means that the underlying -<code>android.hardware.bluetooth</code> feature is required by the application -and sets up filtering based on that feature. </p> - -<p>The table below lists permissions that imply feature requirements -equivalent to those declared in <code><uses-feature></code> elements. Note -that <code><uses-feature></code> declarations, including any declared -<code>android:required</code> attribute, always take precedence over features -implied by the permissions below. </p> - -<p>For any of the permissions below, you can disable filtering based on the -implied feature by explicitly declaring the implied feature explicitly, in a -<code><uses-feature></code> element, with an -<code>android:required="false"</code> attribute. For example, to disable any -filtering based on the <code>CAMERA</code> permission, you would add this -<code><uses-feature></code> declaration to the manifest file:</p> +<dl> + <dt> + <code>android.hardware.camera</code> + </dt> + + <dd> + The app uses the device's back-facing camera. Devices with only a + front-facing camera do not list this feature, so use the + <code>android.hardware.camera.any</code> feature instead if your app can + communicate with any camera, regardless of which direction the camera + faces. + </dd> + + <dt> + <code>android.hardware.camera.any</code> + </dt> + + <dd> + The app uses one of the device's cameras, or an external camera that the + user connects to the device. Use this value instead of + <code>android.hardware.camera</code> if your app does not require the + camera to be a back-facing one. + </dd> + + <dt> + <code>android.hardware.camera.autofocus</code> + </dt> + + <dd> + <p> + The app uses the autofocus feature that the device's camera supports. + </p> + + <p> + By using this feature, an app implies that it also uses the + <code>android.hardware.camera</code> feature, unless this parent feature + is declared with <code>android:required="false"</code>. + </p> + </dd> + + <dt> + <code>android.hardware.camera.capability.manual_post_processing</code> + </dt> + + <dd> + <p> + The app uses the <code>MANUAL_POST_PROCESSING</code> feature that the + device's camera supports. + </p> + + <p> + This feature allows your app to override the camera's auto white balance + functionality. Use <code>android.colorCorrection.transform</code>, + <code>android.colorCorrection.gains</code>, and an + <code>android.colorCorrection.mode</code> of + <code>TRANSFORM_MATRIX</code>. + </p> + </dd> + + <dt> + <code>android.hardware.camera.capability.manual_sensor</code> + </dt> + + <dd> + <p> + The app uses the <code>MANUAL_SENSOR</code> feature that the device's + camera supports. + </p> + + <p> + This feature implies support for auto-exposure locking + (<code>android.control.aeLock</code>), which allows the camera's exposure + time and sensitivity to remain fixed at specific values. + </p> + </dd> + + <dt> + <code>android.hardware.camera.capability.raw</code> + </dt> + + <dd> + <p> + The app uses the <code>RAW</code> feature that the device's camera + supports. + </p> + + <p> + This feature implies that the device can save DNG (raw) files and that + the device's camera provides the DNG-related metadata necessary for your + app to process these raw images directly. + </p> + </dd> + + <dt> + <code>android.hardware.camera.external</code> + </dt> + + <dd> + The app communicates with an external camera that the user connects to the + device. This feature does not guarantee, however, that the external camera + is available for your app to use. + </dd> + + <dt> + <code>android.hardware.camera.flash</code> + </dt> + + <dd> + <p> + The app uses the flash feature that the device's camera supports. + </p> + + <p> + By using this feature, an app implies that it also uses the + <code>android.hardware.camera</code> feature, unless this parent feature + is declared with <code>android:required="false"</code>. + </p> + </dd> + + <dt> + <code>android.hardware.camera.front</code> + </dt> + + <dd> + <p> + The app uses the device's front-facing camera. + </p> + + <p> + By using this feature, an app implies that it also uses the + <code>android.hardware.camera</code> feature, unless this parent feature + is declared with <code>android:required="false"</code>. + </p> + </dd> + + <dt> + <code>android.hardware.camera.level.full</code> + </dt> + + <dd> + The app uses the <code>FULL</code>-level image-capturing support that at + least one of the device's cameras provides. Cameras with <code>FULL</code> + support provide burst-capture capabilities, per-frame control, and manual + post-processing control. + </dd> +</dl> + +<h4 id="device-ui-hw-features"> + Device UI hardware features +</h4> + +<dl> + <dt> + <code>android.hardware.type.automotive</code> + </dt> + + <dd> + <p> + The app is designed to show its UI on a set of screens inside a vehicle. + The user interacts with the app using hard buttons, touch, rotary + controllers, and mouse-like interfaces. The vehicle's screens usually + appear in the center console or the instrument cluster of a vehicle. These + screens usually have limited size and resolution. + </p> + + <p class="note"> + <strong>Note: </strong>It's important to keep in mind that, since the user + is driving while using this type of app UI, the app must minimize driver + distraction. + </p> + </dd> + + <dt> + <code>android.hardware.type.television</code> + </dt> + + <dd> + <p> + (Deprecated; use <a href="#media-sw-features"> + <code>android.software.leanback</code></a> instead.) + </p> + + <p> + The app is designed to show its UI on a television. This feature defines + "television" to be a typical living room television experience: displayed + on a big screen, where the user is sitting far away and the dominant form + of input is something like a d-pad, and generally not using a mouse, + pointer, or touch device. + </p> + </dd> + + <dt> + <code>android.hardware.type.watch</code> + </dt> + + <dd> + The app is designed to show its UI on a watch. A watch is worn on the body, + such as on the wrist. The user is very close to the device while + interacting with it. + </dd> +</dl> + +<h4 id="fingerprint-hw-features"> + Fingerprint hardware features +</h4> + +<dl> + <dt> + <code>android.hardware.fingerprint</code> + </dt> + + <dd> + The app reads fingerprints using the device's biometric hardware. + </dd> +</dl> + +<h4 id="gamepad-hw-features"> + Gamepad hardware features +</h4> + +<dl> + <dt> + <code>android.hardware.gamepad</code> + </dt> + + <dd> + The app captures game controller input, either from the device itself or + from a connected gamepad. + </dd> +</dl> + +<h4 id="infrared-hw-features"> + Infrared hardware features +</h4> + +<dl> + <dt> + <code>android.hardware.consumerir</code> + </dt> + + <dd> + The app uses the device's infrared (IR) capabilities, usually to + communicate with other consumer IR devices. + </dd> +</dl> + +<h4 id="location-hw-features"> + Location hardware features +</h4> + +<dl> + <dt> + <code>android.hardware.location</code> + </dt> + + <dd> + The app uses one or more features on the device for determining location, + such as GPS location, network location, or cell location. + </dd> + + <dt> + <code>android.hardware.location.gps</code> + </dt> + + <dd> + <p> + The app uses precise location coordinates obtained from a Global + Positioning System (GPS) receiver on the device. + </p> + + <p> + By using this feature, an app implies that it also uses the + <code>android.hardware.location</code> feature, unless this parent + feature is declared with the attribute + <code>android:required="false"</code>. + </p> + </dd> + + <dt> + <code>android.hardware.location.network</code> + </dt> + + <dd> + <p> + The app uses coarse location coordinates obtained from a network-based + geolocation system supported on the device. + </p> + + <p> + By using this feature, an app implies that it also uses the + <code>android.hardware.location</code> feature, unless this parent + feature is declared with the attribute + <code>android:required="false"</code>. + </p> + </dd> +</dl> + +<h4 id="nfc-hw-features"> + NFC hardware features +</h4> + +<dl> + <dt> + <code>android.hardware.nfc</code> + </dt> + + <dd> + The app uses the device's Near-Field Communication (NFC) radio features. + </dd> + + <dt> + <code>android.hardware.nfc.hce</code> + </dt> + + <dd> + <p> + (Deprecated.) + </p> + + <p> + The app uses NFC card emulation that is hosted on the device. + </p> + </dd> +</dl> + +<h4 id="opengl-es-hw-features"> + OpenGL ES hardware features +</h4> + +<dl> + <dt> + <code>android.hardware.opengles.aep</code> + </dt> + + <dd> + The app uses the <a href= + "http://www.khronos.org/registry/gles/extensions/ANDROID/ANDROID_extension_pack_es31a.txt" + class="external-link">OpenGL ES Android Extension Pack</a>that is installed + on the device. + </dd> +</dl> + +<h4 id="sensor-hw-features"> + Sensor hardware features +</h4> + +<dl> + <dt> + <code>android.hardware.sensor.accelerometer</code> + </dt> + + <dd> + The app uses motion readings from the device's accelerometer to detect + the device's current orientation. For example, an app could use + accelerometer readings to determine when to switch between portrait and + landscape orientations. + </dd> + + <dt> + <code>android.hardware.sensor.ambient_temperature</code> + </dt> + + <dd> + The app uses the device's ambient (environmental) temperature sensor. For + example, a weather app could report indoor or outdoor temperature. + </dd> + + <dt> + <code>android.hardware.sensor.barometer</code> + </dt> + + <dd> + The app uses the device's barometer. For example, a weather app could + report air pressure. + </dd> + + <dt> + <code>android.hardware.sensor.compass</code> + </dt> + + <dd> + The app uses the device's magnetometer (compass). For example, a navigation + app could show the current direction a user faces. + </dd> + + <dt> + <code>android.hardware.sensor.gyroscope</code> + </dt> + + <dd> + The app uses the device's gyroscope to detect rotation and twist, creating + a six-axis orientation system. By using this sensor, an app can detect more + smoothly whether it needs to switch between portrait and landscape + orientations. + </dd> + + <dt> + <code>android.hardware.sensor.hifi_sensors</code> + </dt> + + <dd> + The app uses the device's high fidelity (Hi-Fi) sensors. For example, a + gaming app could detect the user's high-precision movements. + </dd> + + <dt> + <code>android.hardware.sensor.heartrate</code> + </dt> + + <dd> + The app uses the device's heart rate monitor. For example, a fitness app + could report trends in a user's heart rate over time. + </dd> + + <dt> + <code>android.hardware.sensor.heartrate.ecg</code> + </dt> + + <dd> + The app uses the device's elcardiogram (ECG) heart rate sensor. For + example, a fitness app could report more detailed information about a + user's heart rate. + </dd> + + <dt> + <code>android.hardware.sensor.light</code> + </dt> + + <dd> + The app uses the device's light sensor. For example, an app could display + one of two different color schemes based on the ambient lighting + conditions. + </dd> + + <dt> + <code>android.hardware.sensor.proximity</code> + </dt> + + <dd> + The app uses the device's proximity sensor. For example, a telephony app + could turn off the device's screen when the app detects that the user is + holding the device close to their body. + </dd> + + <dt> + <code>android.hardware.sensor.relative_humidity</code> + </dt> + + <dd> + The app uses the device's relative humidity sensor. For example, a weather + app could use the humidity to calculate and report the current dewpoint. + </dd> + + <dt> + <code>android.hardware.sensor.stepcounter</code> + </dt> + + <dd> + The app uses the device's step counter. For example, a fitness app could + report the number of steps a user needs to take to achieve their daily step + count goal. + </dd> + + <dt> + <code>android.hardware.sensor.stepdetector</code> + </dt> + + <dd> + The app uses the device's step detector. For example, a fitness app could + use the time interval between steps to infer the type of exercise that the + user is doing. + </dd> +</dl> + +<h4 id="screen-hw-features"> + Screen hardware features +</h4> + +<dl> + <dt> + <code>android.hardware.screen.landscape</code> + </dt> + + <dt> + <code>android.hardware.screen.portrait</code> + </dt> + + <dd> + <p> + The app requires the device to use the portrait or landscape orientation. + If your app supports both orientations, then you don't need to declare + either feature. + </p> + + <p> + For example, if your app requires portrait orientation, you should + declare the following feature so that only the devices that support + portrait orientation (always or by user choice) can run your app: + </p> + <pre><uses-feature android:name="android.hardware.screen.portrait" /></pre> + + <p> + Both orientations are assumed not required by default, so your app may be + installed on devices that support one or both orientations. However, if + any of your activities request that they run in a specific orientation, + using the <a href= + "{@docRoot}guide/topics/manifest/activity-element.html#screen">{@code + android:screenOrientation}</a> attribute, then this declaration implies + that your app requires that orientation. For example, if you declare + <a href= + "{@docRoot}guide/topics/manifest/activity-element.html#screen">{@code + android:screenOrientation}</a> with either {@code "landscape"}, {@code + "reverseLandscape"}, or {@code "sensorLandscape"}, then your app will be + available only on devices that support landscape orientation. + </p> + + <p> + As a best practice, you should still declare your requirement for this + orientation using a {@code <uses-feature>} element. If you declare + an orientation for your activity using <a href= + "{@docRoot}guide/topics/manifest/activity-element.html#screen">{@code + android:screenOrientation}</a>, but don't actually require it, you can + disable the requirement by declaring the orientation with a {@code + <uses-feature>} element and include {@code + android:required="false"}. + </p> + + <p> + For backward compatibility, any device running Android 3.1 (API level 12) + or lower supports both landscape and portrait orientations. + </p> + </dd> +</dl> + +<h4 id="telephony-hw-features"> + Telephony hardware features +</h4> + +<dl> + <dt> + <code>android.hardware.telephony</code> + </dt> + + <dd> + The app uses the device's telephony features, such as telephony radio with + data communication services. + </dd> + + <dt> + <code>android.hardware.telephony.cdma</code> + </dt> + + <dd> + <p> + The app uses the Code Division Multiple Access (CDMA) telephony radio + system. + </p> + + <p> + By using this feature, an app implies that it also uses the + <code>android.hardware.telephony</code> feature, unless this parent + feature is declared with <code>android:required="false"</code>. + </p> + </dd> + + <dt> + <code>android.hardware.telephony.gsm</code> + </dt> + + <dd> + <p> + The app uses the Global System for Mobile Communications (GSM) telephony + radio system. + </p> + + <p> + By using this feature, an app implies that it also uses the + <code>android.hardware.telephony</code> feature, unless this parent + feature is declared with <code>android:required="false"</code>. + </p> + </dd> +</dl> + +<h4 id="touchscreen-hw-features"> + Touchscreen hardware features +</h4> + +<dl> + <dt> + <code>android.hardware.faketouch</code> + </dt> + + <dd> + <p> + The app uses basic touch interaction events, such as tapping and + dragging. + </p> + + <p> + When declared as required, this feature indicates that the app is + compatible with a device only if that device emulates a touchscreen + ("fake touch" interface) or has an actual touchscreen. + </p> + + <p> + A device that offers a fake touch interface provides a user input system + that emulates a subset of a touchscreen's capabilities. For example, a + mouse or remote control could drive an on-screen cursor. If your app + requires basic point and click interaction (in other words, it won't work + with only a d-pad controller), you should declare this feature. Because + this is the minimum level of touch interaction, you can also use an app + that declares this feature on devices that offer more complex touch + interfaces. + </p> + + <p class="note"> + <strong>Note:</strong> Apps require the {@code android.hardware.touchscreen} + feature by default. If you want your app to be available to devices that + provide a fake touch interface, you must also explicitly declare that a + touchscreen is not required as follows: + </p> + <pre><uses-feature android:name="android.hardware.touchscreen" <strong>android:required="false"</strong> /></pre> + </dd> + + <dt> + <code>android.hardware.faketouch.multitouch.distinct</code> + </dt> + + <dd> + <p> + The app tracks two or more distinct "fingers" on a fake touch interface. + This is a superset of the <code>android.hardware.faketouch</code> + feature. When declared as required, this feature indicates that the app + is compatible with a device only if that device emulates distinct + tracking of two or more fingers or has an actual touchscreen. + </p> + + <p> + Unlike the distinct multitouch defined by {@code + android.hardware.touchscreen.multitouch.distinct}, input devices that + support distinct multitouch with a fake touch interface don't support all + two-finger gestures because the input in transformed to cursor movement + on the screen. That is, single-finger gestures on such a device move a + cursor, two-finger swipes cause single-finger touch events to occur, and + other two-finger gestures trigger the corresponding two-finger touch + events. + </p> + + <p> + A device that provides a two-finger touch trackpad for cursor movement + can support this feature. + </p> + </dd> + + <dt> + <code>android.hardware.faketouch.multitouch.jazzhand</code> + </dt> + + <dd> + <p> + The app tracks five or more distinct "fingers" on a fake touch interface. + This is a superset of the <code>android.hardware.faketouch</code> + feature. When declared as required, this feature indicates that the app + is compatible with a device only if that device emulates distinct + tracking of five or more fingers or has an actual touchscreen. + </p> + + <p> + Unlike the distinct multitouch defined by {@code + android.hardware.touchscreen.multitouch.jazzhand}, input devices that + support jazzhand multitouch with a fake touch interface don't support all + five-finger gestures because the input in transformed to cursor movement + on the screen. That is, single-finger gestures on such a device move a + cursor, multi-finger gestures cause single-finger touch events to occur, + and other multi-finger gestures trigger the corresponding multi-finger + touch events. + </p> + + <p> + A device that provides a five-finger touch trackpad for cursor movement + can support this feature. + </p> + </dd> + + <dt> + <code>android.hardware.touchscreen</code> + </dt> + + <dd> + <p> + The app uses the device's touchscreen capabilities for gestures that are + more interactive than basic touch events, such as a fling. This is a + superset of the <code>android.hardware.faketouch</code> feature. + </p> + + <p> + By default, your app requires this feature. As such, your app is not + available to devices that provide only an emulated touch interface ("fake + touch") by default. If you want to make your app available on devices + that provide a fake touch interface (or even on devices that provide only + a d-pad controller), you must explicitly declare that a touchscreen is + not required by declaring {@code android.hardware.touchscreen} with + {@code android:required="false"}. You should add this declaration if your + app uses—but does not require—a real touchscreen interface. + </p> + + <p> + If your app in fact requires a touch interface (to perform more advanced + touch gestures such as fling), then you don't need to declare any touch + interface features because they're required by default. However, it's + best if you explicitly declare all features that your app uses. + </p> + + <p> + If you require more complex touch interaction, such as multi-finger + gestures, you should declare that your app uses advanced touchscreen + features. + </p> + </dd> + + <dt> + <code>android.hardware.touchscreen.multitouch</code> + </dt> + + <dd> + <p> + The app uses the device's basic two-point multitouch capabilities, such + as for pinch gestures, but the app does not need to track touches + independently. This is a superset of the + <code>android.hardware.touchscreen</code> feature. + </p> + + <p> + By using this feature, an app implies that it also uses the + <code>android.hardware.touchscreen</code> feature, unless this parent + feature is declared with <code>android:required="false"</code>. + </p> + </dd> + + <dt> + <code>android.hardware.touchscreen.multitouch.distinct</code> + </dt> + + <dd> + <p> + The app uses the device's advanced multitouch capabilities for tracking + two or more points independently. This feature is a superset of the + <code>android.hardware.touchscreen.multitouch</code> feature. + </p> + + <p> + By using this feature, an app implies that it also uses the + <code>android.hardware.touchscreen.multitouch</code> feature, unless this + parent feature is declared with <code>android:required="false"</code>. + </p> + </dd> + + <dt> + <code>android.hardware.touchscreen.multitouch.jazzhand</code> + </dt> + + <dd> + <p> + The app uses the device's advanced multitouch capabilities for tracking + five or more points independently. This feature is a superset of the + <code>android.hardware.touchscreen.multitouch</code> feature. + </p> + + <p> + By using this feature, an app implies that it also uses the + <code>android.hardware.touchscreen.multitouch</code> feature, unless this + parent feature is declared with <code>android:required="false"</code>. + </p> + </dd> +</dl> + +<h4 id="usb-hw-features"> + USB hardware features +</h4> + +<dl> + <dt> + <code>android.hardware.usb.accessory</code> + </dt> + + <dd> + The app behaves as the USB device and connects to USB hosts. + </dd> + + <dt> + <code>android.hardware.usb.host</code> + </dt> + + <dd> + The app uses the USB accessories that are connected to the device. The + device serves as the USB host. + </dd> +</dl> + +<h4 id="wi-fi-hw-features"> + Wi-Fi hardware features +</h4> + +<dl> + <dt> + <code>android.hardware.wifi</code> + </dt> + + <dd> + The app uses 802.11 networking (Wi-Fi) features on the device. + </dd> + + <dt> + <code>android.hardware.wifi.direct</code> + </dt> + + <dd> + The app uses the Wi-Fi Direct networking features on the device. + </dd> +</dl> + +<h3 id="sw-features"> + Software features +</h3> + +<p> + This section presents the software features supported by the most current + platform release. To indicate that your app uses or requires a software + feature, declare the corresponding value (beginning with + <code>"android.software"</code>) in an <code>android:name</code> attribute. + Each time you declare a software feature, use a separate + <code><uses-feature></code> element. +</p> + +<h4 id="communication-sw-features"> + Communication software features +</h4> + +<dl> + <dt> + <code>android.software.sip</code> + </dt> + + <dd> + The app uses Session Initiation Protocol (SIP) services. By using SIP, the + app can support internet telephony operations, such as video conferencing + and instant messaging. + </dd> + + <dt> + <code>android.software.sip.voip</code> + </dt> + + <dd> + <p> + The app uses SIP-based Voice Over Internet Protocol (VoIP) services. By + using VoIP, the app can support real-time internet telephony operations, + such as two-way video conferencing. + </p> + + <p> + By using this feature, an app implies that it also uses the + <code>android.software.sip</code> feature, unless this parent feature is + declared with <code>android:required="false"</code>. + </p> + </dd> + + <dt> + <code>android.software.webview</code> + </dt> + + <dd> + The app displays content from the internet. + </dd> +</dl> + +<h4 id="custom-input-sw-features"> + Custom input software features +</h4> + +<dl> + <dt> + <code>android.software.input_methods</code> + </dt> + + <dd> + The app uses a new input method, which the developer defines in an <a href= + "{@docRoot}reference/android/inputmethodservice/InputMethodService.html">{@code + InputMethodService}</a>. + </dd> +</dl> + +<h4 id="device-management-sw-features"> + Device management software features +</h4> + +<dl> + <dt> + <code>android.software.backup</code> + </dt> + + <dd> + The app includes logic to handle a backup and restore operation. + </dd> + + <dt> + <code>android.software.device_admin</code> + </dt> + + <dd> + The app uses device administrators to enforce a device policy. + </dd> + + <dt> + <code>android.software.managed_users</code> + </dt> + + <dd> + The app supports secondary users and managed profiles. + </dd> + + <dt> + <code>android.software.securely_removes_users</code> + </dt> + + <dd> + The app can <strong>permanently</strong> remove users and their associated + data. + </dd> + + <dt> + <code>android.software.verified_boot</code> + </dt> + + <dd> + The app includes logic to handle results from the device's verified boot + feature, which detects whether the device's configuration changes during a + restart operation. + </dd> +</dl> + +<h4 id="media-sw-features"> + Media software features +</h4> + +<dl> + <dt> + <code>android.software.midi</code> + </dt> + + <dd> + The app connects to musical instruments or outputs sound using the Musical + Instrument Digital Interface (MIDI) protocol. + </dd> + + <dt> + <code>android.software.print</code> + </dt> + + <dd> + The app includes commands for printing documents displayed on the device. + </dd> + + <dt> + <code>android.software.leanback</code> + </dt> + + <dd> + The app presents a UI that is designed for viewing on a large screen, such + as a television. + </dd> + + <dt> + <code>android.software.live_tv</code> + </dt> + + <dd> + The app streams live television programs. + </dd> +</dl> + +<h4 id="screen-interface-sw-features"> + Screen interface software features +</h4> + +<dl> + <dt> + <code>android.software.app_widgets</code> + </dt> + + <dd> + The app uses or provides App Widgets and should be installed only on + devices that include a Home screen or similar location where users can + embed App Widgets. + </dd> + + <dt> + <code>android.software.home_screen</code> + </dt> + + <dd> + The app behaves as a replacement to the device's Home screen. + </dd> + + <dt> + <code>android.software.live_wallpaper</code> + </dt> + + <dd> + The app uses or provides wallpapers that include animation. + </dd> +</dl> + +<h3 id="permissions"> + Permissions that Imply Feature Requirements +</h3> + +<p> + Some of the hardware and software feature constants were made available to + applications after the corresponding API; for example, the + <code>android.hardware.bluetooth</code> feature was added in Android 2.2 (API + level 8), but the Bluetooth API that it refers to was added in Android 2.0 + (API level 5). Because of this, some apps were able to use the API before + they had the ability to declare that they require the API using the + <code><uses-feature></code> system. +</p> + +<p> + To prevent those apps from being made available unintentionally, Google Play + assumes that certain hardware-related permissions indicate that the + underlying hardware features are required by default. For instance, + applications that use Bluetooth must request the <code>BLUETOOTH</code> + permission in a <code><uses-permission></code> element — for legacy + apps, Google Play assumes that the permission declaration means that the + underlying <code>android.hardware.bluetooth</code> feature is required by the + application and sets up filtering based on that feature. Table 2 lists + permissions that imply feature requirements equivalent to those declared in + <code><uses-feature></code> elements. +</p> + +<p> + Note that <code><uses-feature></code> declarations, including any + declared <code>android:required</code> attribute, always take precedence over + features implied by the permissions in table 2. For any of these permissions, + you can disable filtering based on the implied feature by explicitly + declaring the implied feature explicitly, in a + <code><uses-feature></code> element, with an + <code>android:required="false"</code> attribute. For example, to disable any + filtering based on the <code>CAMERA</code> permission, you would add this + <code><uses-feature></code> declaration to the manifest file: +</p> <pre><uses-feature android:name="android.hardware.camera" android:required="false" /></pre> -<table id="permissions-features" > +<p class="table-caption" id="permissions-features"> + <strong>Table 2. </strong>Device permissions that imply device hardware use. +</p> +<table> <tr> <th>Category</th> <th>This Permission...</th> - <th>Implies This Feature Requirement</th> + <th>...Implies This Feature Requirement</th> <!-- <th>Comments</th> --> </tr> diff --git a/docs/html/guide/topics/providers/content-provider-creating.jd b/docs/html/guide/topics/providers/content-provider-creating.jd index 7cd3d6998a18..baa92e131dc7 100755 --- a/docs/html/guide/topics/providers/content-provider-creating.jd +++ b/docs/html/guide/topics/providers/content-provider-creating.jd @@ -409,25 +409,27 @@ page.title=Creating a Content Provider public class ExampleProvider extends ContentProvider { ... // Creates a UriMatcher object. - private static final UriMatcher sUriMatcher; -... - /* - * The calls to addURI() go here, for all of the content URI patterns that the provider - * should recognize. For this snippet, only the calls for table 3 are shown. - */ -... - /* - * Sets the integer value for multiple rows in table 3 to 1. Notice that no wildcard is used - * in the path - */ - sUriMatcher.addURI("com.example.app.provider", "table3", 1); + private static final UriMatcher sUriMatcher = new UriMatcher(UriMatcher.NO_MATCH); - /* - * Sets the code for a single row to 2. In this case, the "#" wildcard is - * used. "content://com.example.app.provider/table3/3" matches, but - * "content://com.example.app.provider/table3 doesn't. - */ - sUriMatcher.addURI("com.example.app.provider", "table3/#", 2); + static { + /* + * The calls to addURI() go here, for all of the content URI patterns that the provider + * should recognize. For this snippet, only the calls for table 3 are shown. + */ + + /* + * Sets the integer value for multiple rows in table 3 to 1. Notice that no wildcard is used + * in the path + */ + sUriMatcher.addURI("com.example.app.provider", "table3", 1); + + /* + * Sets the code for a single row to 2. In this case, the "#" wildcard is + * used. "content://com.example.app.provider/table3/3" matches, but + * "content://com.example.app.provider/table3 doesn't. + */ + sUriMatcher.addURI("com.example.app.provider", "table3/#", 2); + } ... // Implements ContentProvider.query() public Cursor query( diff --git a/docs/html/images/training/tv/playback/guided-step-buttonaction-2x.png b/docs/html/images/training/tv/playback/guided-step-buttonaction-2x.png Binary files differnew file mode 100644 index 000000000000..059cf0ae544c --- /dev/null +++ b/docs/html/images/training/tv/playback/guided-step-buttonaction-2x.png diff --git a/docs/html/images/training/tv/playback/guided-step-buttonaction.png b/docs/html/images/training/tv/playback/guided-step-buttonaction.png Binary files differnew file mode 100644 index 000000000000..aacb844fa550 --- /dev/null +++ b/docs/html/images/training/tv/playback/guided-step-buttonaction.png diff --git a/docs/html/images/training/tv/playback/guided-step-subaction-2x.png b/docs/html/images/training/tv/playback/guided-step-subaction-2x.png Binary files differnew file mode 100644 index 000000000000..411bee4f2289 --- /dev/null +++ b/docs/html/images/training/tv/playback/guided-step-subaction-2x.png diff --git a/docs/html/images/training/tv/playback/guided-step-subaction.png b/docs/html/images/training/tv/playback/guided-step-subaction.png Binary files differnew file mode 100644 index 000000000000..5b004d5b21a4 --- /dev/null +++ b/docs/html/images/training/tv/playback/guided-step-subaction.png diff --git a/docs/html/jd_collections.js b/docs/html/jd_collections.js index 4909206d64d7..aa0620aefd0c 100644 --- a/docs/html/jd_collections.js +++ b/docs/html/jd_collections.js @@ -1881,7 +1881,7 @@ var RESOURCE_COLLECTIONS = { "work/overview.html", "work/guide.html", "https://www.google.com/work/android/developers/applyDevHub/", - "work/app-restrictions.html", + "work/managed-configurations.html", "work/cosu.html", "work/managed-profiles.html" ] @@ -1893,7 +1893,7 @@ var RESOURCE_COLLECTIONS = { "https://www.google.com/work/android/", "https://developers.google.com/android/work/build-dpc", "https://www.youtube.com/watch?v=jQWB_-o1kz4&list=PLOU2XLYxmsIKAK2Bhv19H2THwF-22O5WX", - "https://www.youtube.com/watch?v=39NkpWkaH8M&index=2&list=PLOU2XLYxmsIKAK2Bhv19H2THwF-22O5WX", + "https://www.youtube.com/watch?v=Za0OQo8DRM4", "https://www.youtube.com/watch?v=dH41OutAMNM&list=PLOU2XLYxmsIKAK2Bhv19H2THwF-22O5WX" ] }, @@ -1901,7 +1901,7 @@ var RESOURCE_COLLECTIONS = { "title": "", "resources": [ "work/managed-profiles.html", - "work/app-restrictions.html", + "work/managed-configurations.html", "work/cosu.html", "https://www.youtube.com/watch?v=39NkpWkaH8M&index=2&list=PLOU2XLYxmsIKAK2Bhv19H2THwF-22O5WX", "samples/AppRestrictionSchema/index.html", diff --git a/docs/html/jd_extras.js b/docs/html/jd_extras.js index 546fcfe479f6..e5347d970492 100644 --- a/docs/html/jd_extras.js +++ b/docs/html/jd_extras.js @@ -3379,6 +3379,18 @@ DISTRIBUTE_RESOURCES = DISTRIBUTE_RESOURCES.concat([ "type":"youtube" }, { + "title":"Your Apps at Work", + "titleFriendly":"", + "summary":"In this Google I/O 2016 session we’ll give you details for making your app more attractive to businesses.", + "url":"https://www.youtube.com/watch?v=Za0OQo8DRM4", + "group":"", + "keywords": ["work", "enterprise", "emm"], + "tags": [], + "image":"https://i1.ytimg.com/vi/Za0OQo8DRM4/maxresdefault.jpg", + "lang":"en", + "type":"youtube" + }, + { "title":"Discover YouTube cards", "titleFriendly":"", "summary":"Find out more about YouTube cards, the options available, and how to use them to get the most from your YouTube content.", diff --git a/docs/html/jd_extras_en.js b/docs/html/jd_extras_en.js index 3aab5bdb56e9..6295e0efd00c 100644 --- a/docs/html/jd_extras_en.js +++ b/docs/html/jd_extras_en.js @@ -3266,10 +3266,10 @@ METADATA['en'].extras = METADATA['en'].extras.concat([ "type":"guide" }, { - "title":"Set up App Restrictions", + "title":"Set up Managed Configurations", "titleFriendly":"", - "summary": "Learn how to implement app restrictions and configuration settings that can be changed by other apps on the same device.", - "url":"https://developer.android.com/work/app-restrictions.html", + "summary": "Learn how to implement managed configurations that can be changed by other apps on the same device.", + "url":"https://developer.android.com/work/managed-restrictions.html", "group":"", "keywords": ["work", "enterprise", "emm"], "tags": [], @@ -3398,6 +3398,18 @@ METADATA['en'].extras = METADATA['en'].extras.concat([ "type":"youtube" }, { + "title":"Your Apps at Work", + "titleFriendly":"", + "summary":"In this Google I/O 2016 session we’ll give you details for making your app more attractive to businesses.", + "url":"https://www.youtube.com/watch?v=Za0OQo8DRM4", + "group":"", + "keywords": ["work", "enterprise", "emm"], + "tags": [], + "image":"https://i1.ytimg.com/vi/Za0OQo8DRM4/maxresdefault.jpg", + "lang":"en", + "type":"youtube" + }, + { "title":"Discover YouTube cards", "category":"google", "summary":"Find out more about YouTube cards, the options available, and how to use them to get the most from your YouTube content.", @@ -5390,7 +5402,7 @@ METADATA['en'].collections = { "work/overview.html", "work/guide.html", "https://www.google.com/work/android/developers/applyDevHub/", - "work/app-restrictions.html", + "work/managed-configurations.html", "work/cosu.html", "work/managed-profiles.html" ] @@ -5402,7 +5414,7 @@ METADATA['en'].collections = { "https://www.google.com/work/android/", "https://developers.google.com/android/work/build-dpc", "https://www.youtube.com/watch?v=jQWB_-o1kz4&list=PLOU2XLYxmsIKAK2Bhv19H2THwF-22O5WX", - "https://www.youtube.com/watch?v=39NkpWkaH8M&index=2&list=PLOU2XLYxmsIKAK2Bhv19H2THwF-22O5WX", + "https://www.youtube.com/watch?v=Za0OQo8DRM4", "https://www.youtube.com/watch?v=dH41OutAMNM&list=PLOU2XLYxmsIKAK2Bhv19H2THwF-22O5WX" ] }, @@ -5410,7 +5422,7 @@ METADATA['en'].collections = { "title": "", "resources": [ "work/managed-profiles.html", - "work/app-restrictions.html", + "work/managed-configurations.html", "work/cosu.html", "https://www.youtube.com/watch?v=39NkpWkaH8M&index=2&list=PLOU2XLYxmsIKAK2Bhv19H2THwF-22O5WX", "samples/AppRestrictionSchema/index.html", diff --git a/docs/html/ndk/guides/audio/opensl-prog-notes.jd b/docs/html/ndk/guides/audio/opensl-prog-notes.jd index 326314568386..e70aa080e0ef 100644 --- a/docs/html/ndk/guides/audio/opensl-prog-notes.jd +++ b/docs/html/ndk/guides/audio/opensl-prog-notes.jd @@ -61,8 +61,8 @@ there is no harm in listing it there. OpenSL ES has one more kind of interface c create array and can be added later after the object is created. The Android implementation provides a convenience feature to -avoid this complexity; see the - <a href="#dynamic-interfaces">Dynamic interfaces at object creation</a> section above. +avoid this complexity, which is described in + <a href="{@docRoot}ndk/guides/audio/opensl-for-android.html#dynamic-interfaces">Dynamic interfaces at object creation</a>. </p> <p> diff --git a/docs/html/preview/api-overview.jd b/docs/html/preview/api-overview.jd index ab2b5ba2314e..d457d5cb4877 100644 --- a/docs/html/preview/api-overview.jd +++ b/docs/html/preview/api-overview.jd @@ -119,10 +119,10 @@ use. Some of the changes include:</p> </li> <li> - <strong>Message style customization</strong>: You can customize more of the - user interface labels associated with your notifications using the - <code>MessageStyle</code> class. You can configure the message, conversation - title, and content view. + <strong>Messaging style customization</strong>: You can customize more of + the user interface labels associated with your notifications using the + <code>MessagingStyle</code> class. You can configure the message, + conversation title, and content view. </li> <li> diff --git a/docs/html/preview/features/afw.jd b/docs/html/preview/features/afw.jd index 9b94c079cb92..17cd58ea1b8e 100644 --- a/docs/html/preview/features/afw.jd +++ b/docs/html/preview/features/afw.jd @@ -47,7 +47,7 @@ page.keywords="android for work", "android N", "enterprise", "QR code" <li><a href="#ui-policy">System UI Policy Transparency </a></li> - <li><a href="#restrictions-mgmt">App Restrictions Management Enhancements + <li><a href="#managed-configurations">Managed Configurations Enhancements </a></li> <li><a href="#location-off">Location Off Switch @@ -401,11 +401,11 @@ Android N.</p> </li> </ul> -<h2 id="restrictions-mgmt">App Restrictions Management Enhancements</h2> +<h2 id="managed-configurations">Managed Configurations Enhancements</h2> <p> - The device or profile owner can enable another application to manage app - restrictions via the new + The device or profile owner can enable another application to manage + configurations via the new <code>DevicePolicyManager.setApplicationRestrictionsManagingPackage()</code> method. The nominated application can check whether this permission has been granted by calling @@ -413,7 +413,7 @@ Android N.</p> </p> <p> - An application nominated to manage app restrictions can call {@link + An application nominated to manage configurations can call {@link android.app.admin.DevicePolicyManager#setApplicationRestrictions setApplicationRestrictions()} and {@link android.app.admin.DevicePolicyManager#getApplicationRestrictions diff --git a/docs/html/preview/features/background-optimization.jd b/docs/html/preview/features/background-optimization.jd index 3c33b9d3ff49..3e4c041367a0 100644 --- a/docs/html/preview/features/background-optimization.jd +++ b/docs/html/preview/features/background-optimization.jd @@ -379,7 +379,7 @@ public boolean onStartJob(JobParameters params) { <li style="list-style: none; display: inline"> <pre class="no-pretty-print"> -{@code $ adb shell cmd appops set <package> RUN_IN_BACKGROUND ignore} +{@code $ adb shell cmd appops set <package_name> RUN_IN_BACKGROUND ignore} </pre> </li> @@ -389,7 +389,7 @@ public boolean onStartJob(JobParameters params) { <li style="list-style: none; display: inline"> <pre class="no-pretty-print"> -{@code $ adb shell cmd appops set <package> RUN_IN_BACKGROUND allow} +{@code $ adb shell cmd appops set <package_name> RUN_IN_BACKGROUND allow} </pre> </li> </ul> diff --git a/docs/html/preview/features/notification-updates.jd b/docs/html/preview/features/notification-updates.jd index 016333734b57..af449cbecb5f 100644 --- a/docs/html/preview/features/notification-updates.jd +++ b/docs/html/preview/features/notification-updates.jd @@ -16,7 +16,7 @@ trainingnavtop=true <li><a href="#direct">Direct Reply</a></li> <li><a href="#bundle">Bundled Notifications</a></li> <li><a href="#custom">Custom Views</a></li> - <li><a href="#style">Message Style</a></li> + <li><a href="#style">Messaging Style</a></li> </ol> </div> @@ -378,14 +378,14 @@ Notification notification = new Notification.Builder() <h2 id="style">Messaging Style</h2> <p> Android N introduces a new API for customizing the style of a notification. - Using the <code>MessageStyle</code> class, you can change several of the + Using the <code>MessagingStyle</code> class, you can change several of the labels displayed on the notification, including the conversation title, additional messages, and the content view for the notification. </p> <p> The following code snippet demonstrates how to customize a notification's - style using the <code>MessageStyle</code> class. + style using the <code>MessagingStyle</code> class. </p> <pre> diff --git a/docs/html/samples/index.jd b/docs/html/samples/index.jd index 76ea573ffbbf..5885086fec58 100644 --- a/docs/html/samples/index.jd +++ b/docs/html/samples/index.jd @@ -35,9 +35,8 @@ recommended method to retrieve Android code samples.</p> from GitHub as a new project. </p> -<p>For more information about importing samples, see -<a href="{@docRoot}tools/studio/index.html#git-samples">Easy access to Android code samples on -GitHub</a>.</p> +<p>To view the Android code samples that you can import, see the +<a class="external-link" href="https://github.com/googlesamples/">Google Samples page</a> on GitHub.</p> <h2>Download Samples</h2> diff --git a/docs/html/training/basics/firstapp/building-ui.jd b/docs/html/training/basics/firstapp/building-ui.jd index 402396ea9320..275500c88141 100644 --- a/docs/html/training/basics/firstapp/building-ui.jd +++ b/docs/html/training/basics/firstapp/building-ui.jd @@ -396,20 +396,13 @@ android.widget.LinearLayout}.</p> <h2>Run Your App</h2> <p>This layout is applied by the default {@link android.app.Activity} class -that the SDK tools generated when you created the project. Run the app to see the -results:</p> +that the SDK tools generated when you created the project.</p> -<ul> - <li>In Android Studio, from the toolbar, click <strong>Run</strong> +<p>To run the app and see the results, + click <strong>Run 'app'</strong> <img src="{@docRoot}images/tools/as-run.png" - style="vertical-align:baseline;margin:0; max-height:1em" />.</li> - <li>Or from a command line, change directories to the root of your Android project and -execute: -<pre class="no-pretty-print"> -$ ant debug -adb install -r app/build/outputs/apk/app-debug.apk -</pre></li> -</ul> + style="vertical-align:baseline;margin:0; max-height:1em" /> in the + toolbar.</p> <p>Continue to the <a href="starting-activity.html">next lesson</a> to learn how to respond to button presses, read content diff --git a/docs/html/training/basics/firstapp/running-app.jd b/docs/html/training/basics/firstapp/running-app.jd index 99b38bfc6393..21fb64d83798 100755 --- a/docs/html/training/basics/firstapp/running-app.jd +++ b/docs/html/training/basics/firstapp/running-app.jd @@ -76,46 +76,6 @@ from the toolbar.</li> <p>Android Studio installs the app on your connected device and starts it.</p> -<h3>Run the app from a command line</h3> - -<p>Open a command-line and navigate to the root of your project directory. - Use Gradle to build your project in debug mode, invoke the <code>assembleDebug</code> build task - using the Gradle wrapper script (<code>gradlew assembleRelease</code>). - - <p>This creates your debug <code>.apk</code> file inside the module <code>build/</code> - directory, named <code>app-debug.apk</code>. </p> - - <p>On Windows platforms, type this command:</p> - -<pre> -> gradlew.bat assembleDebug -</pre> - -<p>On Mac OS and Linux platforms, type these commands:</p> - -<pre> -$ chmod +x gradlew -$ ./gradlew assembleDebug -</pre> - - <p>After you build the project, the output APK for the app module is located in - <code>app/build/outputs/apk/</code> - - <p class="note"><strong>Note:</strong> The first command (<code>chmod</code>) adds the execution - permission to the Gradle wrapper script and is only necessary the first time you build this - project from the command line.</p> - - <p>Make sure the Android SDK <code>platform-tools/</code> directory is included in your - <code>PATH</code> environment variable, then execute: - <pre class="no-pretty-print">$ adb install app/build/outputs/apk/app-debug.apk</pre><p> - <p>On your device, locate <em>MyFirstApp</em> and open it.</p> - -<p>That's how you build and run your Android app on a device! - To start developing, continue to the <a href="building-ui.html">next -lesson</a>.</p> - - - <h2 id="Emulator">Run on the Emulator</h2> <p>Whether you're using Android Studio or the command line, to run your app on the emulator you need @@ -168,23 +128,8 @@ device.</p> When you do, <em>My First App</em> appears on the emulator screen.</p> -<h3>Run your app from the command line</h3> - <ol> - <li>Build the project from the command line. The output APK for the app module is located in - <code>app/build/outputs/apk/</code>.</li> - <li>Make sure the Android SDK <code>platform-tools/</code> directory is included in your - <code>PATH</code> environment variable.</li> - <li>Execute this command: - <p> - <pre class="no-pretty-print">$ adb install app/build/outputs/apk/apk-debug.apk</pre> - </p> - </li> - <li>On the emulator, locate <em>MyFirstApp</em> and open it.</li> - </ol> - - - <p>That's how you build and run your Android app on the emulator! - To start developing, continue to the <a href="building-ui.html">next - lesson</a>.</p> +<p>That's how you build and run your Android app on the emulator! +To start developing, continue to the <a href="building-ui.html">next +lesson</a>.</p> diff --git a/docs/html/training/sync-adapters/running-sync-adapter.jd b/docs/html/training/sync-adapters/running-sync-adapter.jd index 033450f159a6..a640aa6d29bd 100644 --- a/docs/html/training/sync-adapters/running-sync-adapter.jd +++ b/docs/html/training/sync-adapters/running-sync-adapter.jd @@ -240,6 +240,7 @@ public class MainActivity extends FragmentActivity { * Ask the framework to run your sync adapter. * To maintain backward compatibility, assume that * changeUri is null. + */ ContentResolver.requestSync(ACCOUNT, AUTHORITY, null); } ... diff --git a/docs/html/training/tv/playback/guided-step.jd b/docs/html/training/tv/playback/guided-step.jd index 121961f03a73..99e5c0867043 100644 --- a/docs/html/training/tv/playback/guided-step.jd +++ b/docs/html/training/tv/playback/guided-step.jd @@ -1,5 +1,6 @@ page.title=Adding a Guided Step -page.tags=tv, guided step +page.tags=tv,guided step,GuidedStepFragment,GuidedAction +page.keywords=tv,GuidedStepFragment,GuidedAction helpoutsWidget=true trainingnavtop=true @@ -12,7 +13,7 @@ trainingnavtop=true <ol> <li><a href="#details">Provide Details for a Step</a></li> <li><a href="#actions">Create and Handle User Actions</a></li> - <li><a href="#sequence">Group Guided Steps Into a Sequence</a></li> + <li><a href="#sequence">Group Guided Steps Into a Guided Sequence</a></li> <li><a href="#presentation">Customize Step Presentation</a></li> </ol> <h2>Try it out</h2> @@ -107,7 +108,7 @@ action item, and provide the action string, description, and ID. Use <pre> @Override -public void onCreateActions(List<GuidedAction> actions, Bundle savedInstanceState) { +public void onCreateActions(List<GuidedAction> actions, Bundle savedInstanceState) { // Add "Continue" user action for this step actions.add(new GuidedAction.Builder() .id(CONTINUE) @@ -119,39 +120,60 @@ public void onCreateActions(List<GuidedAction> actions, Bundle savedInstanceStat </pre> <p> -Actions aren’t limited to single-line selections. Use -{@link android.support.v17.leanback.widget.GuidedAction} attributes -to add the following additional types of actions: +Actions aren't limited to single-line selections. Here are additional types of +actions you can create: </p> <ul> <li> -Add a information label action by setting +Add an information label action by setting {@link android.support.v17.leanback.widget.GuidedAction.Builder#infoOnly infoOnly(true)}. -If <code>infoOnly</code> is set to true, the action can't be selected by the user. Use label -actions to provide additional information about user choices. +If you set <code>infoOnly</code> to true, the user can't select the action. To +provide additional information about user choices, use label actions. </li> <li> Add an editable text action by setting {@link android.support.v17.leanback.widget.GuidedAction.Builder#editable editable(true)}. If <code>editable</code> is true, when the action is selected the user can enter text using the -remote or a connected keyboard. +remote or a connected keyboard. Override +{@link android.support.v17.leanback.app.GuidedStepFragment#onGuidedActionEdited +onGuidedActionEdited()} or +{@code onGuidedActionEditedAndProceed()} to get the modified text the user entered. </li> <li> Add a set of actions that behave as checkable radio buttons by using {@link android.support.v17.leanback.widget.GuidedAction.Builder#checkSetId checkSetId()} with a common ID value to group actions into a set. All actions in the same list with the same -check-set ID are considered linked. When one of the actions within that set is selected, that +check-set ID are considered linked. When the user selects one of the actions within that set, that action becomes checked, while all other actions become unchecked. </li> +<li> +Add a date-picker action by using +{@code GuidedDatePickerAction.Builder} +instead of +{@link android.support.v17.leanback.widget.GuidedAction.Builder} in +{@link android.support.v17.leanback.app.GuidedStepFragment#onCreateActions +onCreateActions()}. Override +{@link android.support.v17.leanback.app.GuidedStepFragment#onGuidedActionEdited +onGuidedActionEdited()} or +{@code onGuidedActionEditedAndProceed()} to get the modified date value the user entered. +</li> +<li> +Add an action that uses subactions to let the user pick from an extended list of +choices. Subactions are described in <a href="#subactions">Add subactions</a>. +</li> +<li> +Add a button action that appears to the right of the actions list and is easily +accessible. Button actions are described in <a href="#buttonactions">Add button +actions</a>.</li> </ul> <p> -You can also add a visual indicator that indicates selecting the action leads to a new step by -setting +You can also add a visual indicator—to indicate that selecting the action +leads to a new step—by setting {@link android.support.v17.leanback.widget.GuidedAction#hasNext hasNext(true)}. -See {@link android.support.v17.leanback.widget.GuidedAction} for all the different attributes -you can set. +For all the different attributes that you can set, see +{@link android.support.v17.leanback.widget.GuidedAction}. </p> <p> @@ -162,6 +184,111 @@ onGuidedActionClicked()} and process the passed-in examining {@link android.support.v17.leanback.widget.GuidedAction#getId GuidedAction.getId()}. </p> +<h3 id="subactions">Add subactions</h3> + +<p> +Some actions might require giving the user an additional set of choices. A +{@link android.support.v17.leanback.widget.GuidedAction} can specify a list of +subactions that get displayed as a drop-down list of child actions. +</p> + +<img src="{@docRoot}images/training/tv/playback/guided-step-subaction.png" +srcset="{@docRoot}images/training/tv/playback/guided-step-subaction.png 1x, +{@docRoot}images/training/tv/playback/guided-step-subaction-2x.png 2x" /> +<p class="img-caption"><strong>Figure 2.</strong> Guided step subactions.</p> + +<p> +The subaction list can contain regular actions or radio button actions, but +not date-picker or editable text actions. Also, a subaction cannot have its own +set of subactions as the system does not support more than one level of subactions. +Deeply nested sets of actions create a poor user experience. +</p> + +<p> +To add subactions, first create and populate a list of +{@link android.support.v17.leanback.widget.GuidedAction GuidedActions} that will +act as subactions: +</p> + +<pre> +List<GuidedAction> subActions = new ArrayList<GuidedAction>(); +subActions.add(new GuidedAction.Builder() + .id(SUBACTION1) + .title(getString(R.string.guidedstep_subaction1_title)) + .description(getString(R.string.guidedstep_subaction1_desc)) + .build()); +... +</pre> + +<p> +In {@link android.support.v17.leanback.app.GuidedStepFragment#onCreateActions +onCreateActions()}, create a top-level +{@link android.support.v17.leanback.widget.GuidedAction} that will display the +list of subactions when selected: +</p> + +<pre> +@Override +public void onCreateActions(List<GuidedAction> actions, Bundle savedInstanceState) { +... + actions.add(new GuidedAction.Builder() + .id(SUBACTIONS) + .title(getString(R.string.guidedstep_subactions_title)) + .description(getString(R.string.guidedstep_subactions_desc)) + <b>.subActions(subActions)</b> + .build()); +... +} +</pre> + +<p> +Finally, respond to subaction selections by overriding +{@code onSubGuidedActionClicked()}: +</p> + +<pre> +@Override +public boolean onSubGuidedActionClicked(GuidedAction action) { + // Check for which action was clicked, and handle as needed + if (action.getId() == SUBACTION1) { + // Subaction 1 selected + } + // Return true to collapse the subactions drop-down list, or + // false to keep the drop-down list expanded. + return true; +} +</pre> + +<h3 id="buttonactions">Add button actions</h3> + +<p> +If your guided step has a large list of actions, users may have to scroll through the list +to access the most commonly used actions. Use button actions to separate +commonly used actions from the action list. Button actions appear to the right +of the action list and are easy to navigate to. +</p> + +<img src="{@docRoot}images/training/tv/playback/guided-step-buttonaction.png" +srcset="{@docRoot}images/training/tv/playback/guided-step-buttonaction.png 1x, +{@docRoot}images/training/tv/playback/guided-step-buttonaction-2x.png 2x" /> +<p class="img-caption"><strong>Figure 3.</strong> Guided step button actions.</p> + +<p> +Button actions are created and handled just like regular actions, but you create +button actions in +{@code onCreateButtonActions()} instead of +{@link android.support.v17.leanback.app.GuidedStepFragment#onCreateActions +onCreateActions()}. Respond to button actions in +{@link android.support.v17.leanback.app.GuidedStepFragment#onGuidedActionClicked +onGuidedActionClicked()}. +</p> + +<p> +Use button actions for simple actions, such as navigation actions between steps. +Don't use the date-picker action or other editable actions as button actions. +Also, button actions cannot have subactions. +</p> + <h2 id="sequence">Group Guided Steps Into a Guided Sequence</h2> <p> @@ -188,6 +315,20 @@ If the user presses the Back button on the TV remote, the device shows the previ decide to provide your own {@link android.support.v17.leanback.widget.GuidedAction} that returns to the previous step, you can implement the Back behavior by calling {@link android.app.FragmentManager#popBackStack getFragmentManager().popBackStack()}. +If you need to return the user to an even earlier step in the sequence, use +{@code popBackStackToGuidedStepFragment()} to return to a specific +{@link android.support.v17.leanback.app.GuidedStepFragment} in the fragment stack. +</p> + +<p> +When the user has finished the last step in the sequence, use +{@code finishGuidedStepFragments()} to remove all +{@link android.support.v17.leanback.app.GuidedStepFragment GuidedStepFragments} +from the current stack and return to the original parent activity. If the +first {@link android.support.v17.leanback.app.GuidedStepFragment} was added +using {@link android.support.v17.leanback.app.GuidedStepFragment#addAsRoot +addAsRoot()}, calling +{@code finishGuidedStepFragments()} will also close the parent activity. </p> <h2 id="presentation">Customize Step Presentation</h2> @@ -220,11 +361,11 @@ add the {@link android.support.v17.leanback.R.styleable#LeanbackGuidedStepTheme_guidedStepTheme} attribute to your existing custom activity theme. This attribute points to the custom theme that only the {@link android.support.v17.leanback.app.GuidedStepFragment} objects in your -activity will use. +activity use. </li> <li> If you use {@link android.support.v17.leanback.app.GuidedStepFragment} objects in different -activities that are part of the same overall multi-step task, and want to use a consistent +activities that are part of the same overall multi-step task and want to use a consistent visual theme across all steps, override {@link android.support.v17.leanback.app.GuidedStepFragment#onProvideTheme GuidedStepFragment.onProvideTheme()} and return your custom theme. diff --git a/docs/html/wear/preview/api-overview.jd b/docs/html/wear/preview/api-overview.jd index 384cb0a416ce..543313af1a39 100644 --- a/docs/html/wear/preview/api-overview.jd +++ b/docs/html/wear/preview/api-overview.jd @@ -147,7 +147,7 @@ see <a href="{@docRoot}wear/preview/features/complications.html"> <p> If you have a chat messaging app, your notifications should use {@code Notification.MessagingStyle}, which is new in Android 6.0. Wear 2.0 uses the chat messages included in a -<a href="{docRoot}preview/features/notification-updates.html#style">{@code MessagingStyle}</a> +<a href="{@docRoot}preview/features/notification-updates.html#style">{@code MessagingStyle}</a> notification (see {@code addMessage()}) to provide a rich chat app-like experience in the expanded notification. diff --git a/docs/html/wear/preview/downloads.jd b/docs/html/wear/preview/downloads.jd index b119d57b0e72..86895047d7d2 100644 --- a/docs/html/wear/preview/downloads.jd +++ b/docs/html/wear/preview/downloads.jd @@ -418,13 +418,15 @@ This is the Android Wear SDK Preview License Agreement (the “License Agreement devices, <code>fastboot oem unlock</code> </li> - <li>Navigate to the directory where you unzipped the system image in Step - 1. + <li>On the watch, select the <strong>Unlock</strong> option. </li> - <li>Execute the <code>flash-all</code> script by typing + <li>Navigate to the directory where you unzipped the system image in Step + 1. At the top level of that directory, + execute the <code>flash-all</code> script by typing <code>flash-all.sh</code> or, in the case of Windows, - <code>flash-all.bat</code>. + <code>flash-all.bat</code>. The following may need to + precede the command: <code>./</code> </li> </ol> @@ -434,40 +436,10 @@ This is the Android Wear SDK Preview License Agreement (the “License Agreement </h4> <p> - After the <code>flash-all</code> script finishes, your watch reboots - and soon will be ready for testing with the preview image. - </p> - - <ol> - <li>Attach the watch charger to the watch and plug the USB cord - into your computer, if it is not already plugged in. - </li> - - <li>Use the following <a href="{@docRoot}tools/help/adb.html">adb - command</a> to confirm that the watch is available: - <code>adb devices</code> - </li> - - <li>Use the following adb command to start the device in fastboot mode: - <code>adb reboot bootloader</code> - </li> - - <li>Use the following command to - lock the device's bootloader: <code>fastboot flashing lock</code> or, for some - devices, <code>fastboot oem lock</code> - </li> - - <li>On the watch, continue the boot by touching <strong>'0'</strong>. - </li> - - </ol> - - - <p> - Pair the watch with a - phone or tablet. The preview now is available for testing on the watch. - Before installing an app, enable the Developer Options menu, and ADB - debugging, on the watch as follows: + After the <code>flash-all</code> script finishes, your watch reboots. + Pair the watch with a phone or tablet. The preview now is available + for testing on the watch. Before installing an app, perform the + following steps on the watch to re-secure the watch's bootloader: </p> <ol> @@ -490,6 +462,19 @@ This is the Android Wear SDK Preview License Agreement (the “License Agreement <li>Connect the watch to your computer and tap <strong>Always allow from this computer</strong>. </li> + + <li>Use the following adb command to start the device in fastboot mode: + <code>adb reboot bootloader</code> + </li> + + <li>Use the following command to + lock the device's bootloader: <code>fastboot flashing lock</code> or, for some + devices, <code>fastboot oem lock</code> + </li> + + <li>On the watch, continue the boot by choosing + <strong>Start</strong> and touching <strong>'0'</strong>. + </li> </ol> <p> @@ -502,8 +487,8 @@ This is the Android Wear SDK Preview License Agreement (the “License Agreement <li>Open your app in Android Studio. </li> - <li>Select <strong>wear</strong> from the Run/Debug configuration - drop-down menu. + <li>Select your Wear app module name from the Run/Debug configuration + drop-down menu (typically <strong>wear</strong>). </li> <li>Click the Play button. @@ -514,8 +499,7 @@ This is the Android Wear SDK Preview License Agreement (the “License Agreement </ol> <p> - After your app is installed on the watch, you are prompted to start the - app on the watch. + After your app is installed on the watch, the app should run. </p> <p> @@ -567,10 +551,12 @@ This is the Android Wear SDK Preview License Agreement (the “License Agreement <li>Click <strong>Create Virtual Device</strong>. </li> - <li>In the <strong>Category</strong> pane, select Wear, choose a hardware profile, - and click <strong>Next</strong>. The Android Wear 2.0 Developer Preview + <li>In the <strong>Category</strong> pane, select Wear and + choose a hardware profile. + The Android Wear 2.0 Developer Preview is only optimized for round devices currently, so we recommend not using the square or chin profiles for now. + Click <strong>Next</strong>. </li> <li>Select an <strong>N</strong> image to download. The images may be on @@ -588,7 +574,8 @@ This is the Android Wear SDK Preview License Agreement (the “License Agreement </ol> <p> - You can now test an application in the <a href= + You can now test an application with a virtual preview device + in the <a href= "{@docRoot}tools/devices/emulator.html">Android Emulator</a>. For more information about using virtual devices, see <a href= "{@docRoot}tools/devices/managing-avds.html">Managing AVDs with the AVD diff --git a/docs/html/wear/preview/features/notifications.jd b/docs/html/wear/preview/features/notifications.jd index 0962eb4b5f82..c84a47002f9d 100644 --- a/docs/html/wear/preview/features/notifications.jd +++ b/docs/html/wear/preview/features/notifications.jd @@ -41,7 +41,7 @@ material design</a> visual changes. </p> <p><img src="{@docRoot}wear/preview/images/comparison_diagram.png" /> </p> -<p><b>Figure 1.</b> Comparison of the same notification in Android Wear 1.x and 2.0.</p> +<p><b>Figure 1.</b> Comparison of the same notification in Android Wear 1.x and 2.0.</p> <p>Some of the visual updates include:</p> <ul> @@ -73,7 +73,7 @@ material design</a> visual changes. <li><strong>Updated horizontal swipe gesture on a notification</strong>: To dismiss a notification in Wear 2.0, the user swipes horizontally in either - direction. So if your notification instructs the user to swipe left or right, + direction. So if your notification instructs the user to swipe left or right, you must update the text of your notification. </li> </ul> @@ -82,13 +82,14 @@ material design</a> visual changes. substantial additional content and actions for each notification. </p> <p>When you <a href="{@docRoot}training/wearables/notifications/pages.html">specify additional content pages</a> - and actions for a notification, those are available to the user within the - expanded notification. Each expanded notification follows + and actions for a notification, those are available to the user within the + expanded notification. Each expanded notification follows <a href="http://www.google.com/design/spec-wear">Material Design for Android Wear</a>, so the user gets an app-like experience. </p> -<p><img src="{@docRoot}wear/preview/images/expanded_diagram.png" /> </p> -<p><b>Figure 2</b>. An expanded notification with content and actions.</p> + + +<h3 id="expanded">Expanded notifications</h3> <p>If the first action in the expanded notification has a <a href=" {@docRoot}reference/android/support/v4/app/RemoteInput.html">{@code RemoteInput}</a> (e.g., a Reply action), then the choices you set with <a href="http://developer.android.com/reference/android/support/v4/app/RemoteInput.Builder.html#setChoices(java.lang.CharSequence[])">{@code setChoices()}</a> @@ -102,7 +103,7 @@ material design</a> visual changes. <li>The notification is generated by an app on the paired phone and bridged to Wear. </li> - <li>The notification does not have a + <li>The notification does not have a <a href="http://developer.android.com/reference/android/support/v4/app/NotificationCompat.Builder.html#setContentIntent(android.app.PendingIntent)">{@code contentIntent}</a>. </li> </ul> @@ -126,9 +127,11 @@ material design</a> visual changes. <p> Expanded Notifications allow you to include additional content and actions for a notification. You choose the level of detail that your app's notifications - will provide; however be judicious with the amount of detail you include in a - notification. + will provide; however be judicious with the amount of detail you include in a + notification. </p> +<img src="{@docRoot}wear/preview/images/expanded_diagram.png" height="340" + style="float:left;margin:10px 20px 0 0" /> <h4>Adding additional content</h4> To show additional content in your expanded notification, see <a href="{@docRoot}training/wearables/notifications/pages.html">Adding Pages to a Notification</a>.</p> <p>Additional content pages are stacked vertically in the expanded notification @@ -151,34 +154,36 @@ action in the notification unless a different action is specified using <p>If you have a chat messaging app, your notifications should use <a href="{@docRoot}preview/features/notification-updates.html#style">{@code Notification.MessagingStyle}</a>, - which is new in Android 6.0. Wear 2.0 uses the chat messages included + which is new in Android N. Wear 2.0 uses the chat messages included in a <a href="{@docRoot}preview/features/notification-updates.html#style">{@code MessagingStyle}</a> notification + (see <a href="{@docRoot}preview/features/notification-updates.html#style">{@code addMessage()}</a>) to provide a rich chat app-like experience in the expanded notification. </p> -<p class="note">Note: <a href="{@docRoot}preview/features/notification-updates.html#style">{@code MessagingStyle}</a> + +<p class="note">Note: <a href="{@docRoot}preview/features/notification-updates.html#style">{@code MessagingStyle}</a> expanded notifications require that you have at least version 1.5.0.2861804 of the <a href="https://play.google.com/store/apps/details?id=com.google.android.wearable.app">Android Wear app</a> on your paired Android phone. That version will be available within the next few weeks in the Play Store. </p> + <h3 id="smart-reply">Smart Reply</h3> -<p>Wear 2.0 also introduces <i>Smart Reply</i> for <a href="{@docRoot}preview/features/notification-updates.html#style">{@code MessagingStyle}</a> notifications. +<img src="{@docRoot}wear/preview/images/messaging_style.png" height="420" + style="float:right;margin:10px 20px 0 0" /> +<p>Wear 2.0 also introduces <i>Smart Reply</i> +for <a href="{@docRoot}preview/features/notification-updates.html#style">{@code MessagingStyle}</a> notifications. Smart Reply provides the user with contextually relevant, touchable choices in the expanded notification and in {@code RemoteInput}. These augment the fixed - list of choices that the developer provides in + list of choices that the developer provides in <a href="http://developer.android.com/reference/android/support/v4/app/RemoteInput.html">{@code RemoteInput}</a> - using the + using the <a href="{@docRoot}reference/android/support/v4/app/RemoteInput.Builder.html#setChoices(java.lang.CharSequence[])">{@code setChoices()}</a> method. </p> <p>By enabling Smart Reply for your MessagingStyle notifications, you provide users with a fast (single tap), discreet (no speaking aloud), and reliable way to respond to chat messages. </p> -<p><img src="{@docRoot}wear/preview/images/messaging_style.png" /></p> -<p><b>Figure 3</b>. The expanded notification includes contextually relevant - Smart Reply responses below the primary action. -</p> <p>Responses generated by Smart Reply are shown in addition to those set using the <a href="{@docRoot}reference/android/support/v4/app/RemoteInput.Builder.html#setChoices(java.lang.CharSequence[])">{@code setChoices()}</a> method. @@ -189,9 +194,10 @@ following: <ol> <li>Use <a href="{@docRoot}preview/features/notification-updates.html#style">{@code Notification.MessagingStyle}</a>. </li> - <li>Call the method - <a href="{@docRoot}wear/preview/start.html#get_the_preview_reference_documentation">{@code setAllowGeneratedReplies()}</a> - for the notification action.</li> + <li>Call the method {@code setAllowGeneratedReplies()} for the notification action. + For more information, see the downloadable + <a href="{@docRoot}preview/setup-sdk.html#docs-dl">API reference</a>. + </li> <li>Ensure that the notification action has a <a href="{@docRoot}reference/android/app/RemoteInput.html">{@code RemoteInput}</a> (where the responses will reside). @@ -222,8 +228,9 @@ Notification noti = new NotificationCompat.Builder() .setSmallIcon(R.drawable.new_message) .setLargeIcon(aBitmap) // 2) set the style to MessagingStyle - .setStyle(new NotificationCompat.MessagingStyle(resources.getString(R.string.reply_name)).addMessage(messages[0].getText(), messages[0].getTime(), messages[0].getSender()) - .addMessage(messages[1].getText(), messages[1].getTime(), messages[1].getSender())) + .setStyle(new NotificationCompat.MessagingStyle(resources.getString(R.string.reply_name)) + .addMessage(messages[0].getText(), messages[0].getTime(), messages[0].getSender()) + .addMessage(messages[1].getText(), messages[1].getTime(), messages[1].getSender())) // 3) add an action with RemoteInput diff --git a/docs/html/wear/preview/features/ui-nav-actions.jd b/docs/html/wear/preview/features/ui-nav-actions.jd index 800fc8e74e83..1ba275fa97c1 100644 --- a/docs/html/wear/preview/features/ui-nav-actions.jd +++ b/docs/html/wear/preview/features/ui-nav-actions.jd @@ -19,10 +19,10 @@ page.image=/wear/preview/images/card_drawer.png <h2>You should also read</h2> <ul> - <li><a href="http://www.google.com/design/wear-spec/components/navigation-drawer.html"> + <li><a href="http://www.google.com/design/spec-wear/components/navigation-drawer.html"> Navigation Drawer Design</a> </li> <li> - <a href="http://www.google.com/design/wear-spec/components/action-drawer.html"> + <a href="http://www.google.com/design/spec-wear/components/action-drawer.html"> Action Drawer Design</a> </ul> @@ -76,6 +76,7 @@ To add an action or a navigation drawer, declare your user interface with a <android.support.wearable.view.drawer.WearableDrawerLayout android:id="@+id/drawer_layout" xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" tools:deviceIds="wear"> diff --git a/docs/html/wear/preview/images/comparison_diagram.png b/docs/html/wear/preview/images/comparison_diagram.png Binary files differindex 7dbf65f2a216..4bcf10e9aeda 100644 --- a/docs/html/wear/preview/images/comparison_diagram.png +++ b/docs/html/wear/preview/images/comparison_diagram.png diff --git a/docs/html/wear/preview/images/messaging_style.png b/docs/html/wear/preview/images/messaging_style.png Binary files differindex 966e524c6db5..a3bf109aa15f 100644 --- a/docs/html/wear/preview/images/messaging_style.png +++ b/docs/html/wear/preview/images/messaging_style.png diff --git a/docs/html/wear/preview/images/messaging_style_diagram.png b/docs/html/wear/preview/images/messaging_style_diagram.png Binary files differdeleted file mode 100644 index 3b21c79730bc..000000000000 --- a/docs/html/wear/preview/images/messaging_style_diagram.png +++ /dev/null diff --git a/docs/html/work/_book.yaml b/docs/html/work/_book.yaml index 82571f314a95..1482a4e3db8e 100644 --- a/docs/html/work/_book.yaml +++ b/docs/html/work/_book.yaml @@ -1,18 +1,132 @@ toc: - title: Android for Work Home path: /work/index.html + path_attributes: + - name: es-lang + value: Página principal de Android for Work + - name: in-lang + value: Beranda Android for Work + - name: ja-lang + value: Android for Work ホーム + - name: ko-lang + value: Android for Work 홈 + - name: pt-br-lang + value: Página inicial do Android for Work + - name: ru-lang + value: Главная – Android for Work + - name: vi-lang + value: Trang chủ Android for Work + - name: zh-cn-lang + value: Android for Work 首页 + - name: zh-tw-lang + value: Android for Work 首頁 - title: Overview path: /work/overview.html + path_attributes: + - name: es-lang + value: Información general + - name: in-lang + value: Ringkasan + - name: ja-lang + value: 概要 + - name: ko-lang + value: 개요 + - name: pt-br-lang + value: Visão geral + - name: ru-lang + value: Обзор + - name: vi-lang + value: Tổng quan + - name: zh-cn-lang + value: 概览 + - name: zh-tw-lang + value: 總覽 - title: Developer Guide path: /work/guide.html + path_attributes: + - name: es-lang + value: Guía para desarrolladores + - name: in-lang + value: Panduan Pengembang + - name: ja-lang + value: デベロッパー ガイド + - name: ko-lang + value: 개발자 가이드 + - name: pt-br-lang + value: Guia do desenvolvedor + - name: ru-lang + value: Руководство для разработчиков + - name: vi-lang + value: Hướng dẫn cho nhà phát triển + - name: zh-cn-lang + value: 开发者指南 + - name: zh-tw-lang + value: 開發人員指南 - title: Set up Managed Profiles path: /work/managed-profiles.html + path_attributes: + - name: es-lang + value: Configurar perfiles administrados + - name: in-lang + value: Menyiapkan Profil Terkelola + - name: ja-lang + value: 管理対象プロファイルの設定 + - name: ko-lang + value: 관리 프로필 설정 + - name: pt-br-lang + value: Configurar perfis gerenciados + - name: ru-lang + value: Настройка управляемых профилей + - name: vi-lang + value: Thiết lập hồ sơ được quản lý + - name: zh-cn-lang + value: 设置托管配置文件 + - name: zh-tw-lang + value: 設定受管理的設定檔 -- title: Set up App Restrictions - path: /work/app-restrictions.html +- title: Set up Managed Configurations + path: /work/managed-configurations.html + path_attributes: + - name: es-lang + value: Configurar ajustes administrados + - name: in-lang + value: Menyiapkan Konfigurasi Terkelola + - name: ja-lang + value: 管理対象構成の設定 + - name: ko-lang + value: 관리 구성 설정 + - name: pt-br-lang + value: Definir configurações gerenciadas + - name: ru-lang + value: Настройка управляемых конфигураций + - name: vi-lang + value: Thiết lập cấu hình được quản lý + - name: zh-cn-lang + value: 设置托管配置 + - name: zh-tw-lang + value: 設置受管理的設定 - title: Set up Single-Purpose Devices path: /work/cosu.html + path_attributes: + - name: es-lang + value: Configurar dispositivos con una sola finalidad + - name: in-lang + value: Menyiapkan Perangkat Tujuan Tunggal + - name: ja-lang + value: 用途に特化した端末の設定 + - name: ko-lang + value: 단일 목적 기기 설정 + - name: pt-br-lang + value: Configurar dispositivos com uma finalidade específica + - name: ru-lang + value: Настройка одноцелевых устройств + - name: vi-lang + value: Thiết lập thiết bị chuyên dùng + - name: zh-cn-lang + value: 设置单一用途设备 + - name: zh-tw-lang + value: 設定單一用途的裝置 diff --git a/docs/html/work/cosu.jd b/docs/html/work/cosu.jd index 3058365a150a..dfecf008be44 100644 --- a/docs/html/work/cosu.jd +++ b/docs/html/work/cosu.jd @@ -128,7 +128,7 @@ Prevents restarting in safe mode <p> Additional COSU management features launched with Marshmallow make it easier to develop and deploy Android devices as a single-use device. If you want to -enforce server-side app restrictions or server-side profile policy controls, +enforce server-side managed configurations or server-side profile policy controls, you need to use an EMM or make your application a DPC. Follow the instructions below as you create your application. </p> @@ -343,7 +343,7 @@ Keep a device’s screen on while plugged in via </li> <li> -Set default user restrictions via +Set default user restriction for managed configurations via {@link android.app.admin.DevicePolicyManager#addUserRestriction addUserRestriction()} </li> @@ -398,7 +398,7 @@ public class CosuActivity extends Activity { } private void setDefaultCosuPolicies(boolean active) { - // set user restrictions + // set managed configurations setUserRestriction(DISALLOW_SAFE_BOOT, active); setUserRestriction(DISALLOW_FACTORY_RESET, active); setUserRestriction(DISALLOW_ADD_USER, active); diff --git a/docs/html/work/guide.jd b/docs/html/work/guide.jd index a93bfa53ab06..30b895bdb66b 100644 --- a/docs/html/work/guide.jd +++ b/docs/html/work/guide.jd @@ -10,7 +10,7 @@ page.image=images/work/cards/android-studio_600px.png <h2>In this document</h2> <ul> <li><a href="#managed-profiles">Managed Profiles</a></li> - <li><a href="#app-restrictions">Implementing App Restrictions</a></li> + <li><a href="#managed-configurations">Implementing Managed Configurations</a></li> <li><a href="#cosu">COSU Devices</a></li> <li><a href="#sso">Set up Single Sign-on with Chrome Custom Tabs</a></li> <li><a href="#testing">Test Your App</a></li> @@ -32,7 +32,7 @@ page.image=images/work/cards/android-studio_600px.png app so it functions best on an Android device with a work profile. </li> <li> - <a href="#app-restrictions">Managed configuration using app restrictions</a>—Modify + <a href="#managed-configurations">Managed configurations</a>—Modify your app to allow IT administrators the option to specify custom settings for your apps. </li> @@ -191,10 +191,10 @@ page.image=images/work/cards/android-studio_600px.png <a href="#testing">Test your app with Android for Work</a>. </p> -<h2 id="app-restrictions">Implementing App Restrictions</h2> +<h2 id="managed-configurations">Implementing Managed Configurations</h2> <p> - App restrictions are a set of instructions that IT administrators + Managed configurations are a set of instructions that IT administrators can use to manage their users’ mobile devices in a specific way. These instructions are universal and work across any EMM, allowing administrators to remotely configure applications on their users’ @@ -204,7 +204,7 @@ page.image=images/work/cards/android-studio_600px.png <p> If you’re developing apps for business or government, you may need to satisfy your industry’s specific set of requirements. Using - application restrictions, the IT administrator can remotely specify + managed configurations, the IT administrator can remotely specify settings and enforce policies for their users’ Android apps; for example: </p> @@ -217,26 +217,26 @@ page.image=images/work/cards/android-studio_600px.png <li>Manage bookmarks</li> </ul> -<h3>Best practices for implementing app restrictions</h3> +<h3>Best practices for implementing managed configurations</h3> <p> - The <a href="{@docRoot}work/app-restrictions.html">Set up App Restrictions</a> + The <a href="{@docRoot}work/managed-configurations.html">Set up Managed Configurations</a> guide is the key source for information on how to build and deploy - app restrictions. After you’ve reviewed this documentation, see + managed configurations. After you’ve reviewed this documentation, see recommendations below for additional guidance. </p> <h4>When first launching the app</h4> <p> - As soon as you launch an application, you can see if app - restrictions are already set for this app in <code>onStart()</code> or + As soon as you launch an application, you can see if managed + configurations are already set for this app in <code>onStart()</code> or <code>onResume()</code>. Additionally, you can find out if your application is managed or unmanaged. For example, if <a href="{@docRoot}reference/android/content/RestrictionsManager.html#getApplicationRestrictions()" ><code>getApplicationRestrictions()</code></a> returns: <ul> <li><strong>A set of application-specific restrictions</strong>—You - can configure the app restrictions silently (without requiring + can configure the managed configurations silently (without requiring user input).</li> <li><strong>An empty bundle</strong>—Your application acts like it’s unmanaged (for example, how the app behaves in a personal @@ -250,12 +250,12 @@ page.image=images/work/cards/android-studio_600px.png </ul> </p> -<h4>Listen for changes to app restrictions</h4> +<h4>Listen for changes to managed configurations</h4> <p> - IT administrators can change app restrictions and what policies they - want to enforce on their users at any time. Because of this, we - recommend you ensure that your app can accept new restrictions as - follows: + IT administrators can change managed configurations and what + policies they want to enforce on their users at any time. Because of + this, we recommend you ensure that your app can accept new + restrictions for your managed configuration as follows: </p> <ul> @@ -318,7 +318,7 @@ page.image=images/work/cards/android-studio_600px.png </ol> <p> - A solution to both problems is to authenticate users using Chrome + A solution to both problems is to authenticate users using browser Custom Tabs, instead of WebView. This ensures that authentication: </p> <ul> @@ -335,19 +335,23 @@ page.image=images/work/cards/android-studio_600px.png <h3>Requirements</h3> <p> - Chrome Custom Tabs are supported using Platform APIs from API level - 23 (Android 6.0), and support libraries back to API level 4 (Android - 1.6). To implement Chrome Custom Tabs, you need to use a supported - browser, such as Chrome 45 or later. + <a href="https://developer.android.com/topic/libraries/support-library/features.html#custom-tabs" + >Custom Tabs</a> are supported back to API level 15 (Android 4.0.3). + To use Custom Tabs you need a supported browser, such as Chrome. + Chrome 45 and later implement this feature as + <a href="https://developer.chrome.com/multidevice/android/customtabs">Chrome Custom Tabs</a>. </p> -<h3>How do I implement Chrome Custom Tabs?</h3> +<h3>How do I implement SSO with Custom Tabs?</h3> <p> - Google, in conjunction with the OpenID Foundation, has published an - open source library on GitHub. To set up Chrome Custom Tabs for SSO, - see the <a href="https://github.com/openid/AppAuth-Android" - >documentation and sample code on GitHub</a>. + Google has open sourced an OAuth client library that uses Custom + Tabs, contributing it to the OpenID Connect working group of the + OpenID Foundation. To set up Custom Tabs for SSO with the + AppAuth library, see the <a href="https://github.com/openid/AppAuth-Android" + >documentation and sample code on GitHub</a>, or try + <a href="https://codelabs.developers.google.com/codelabs/appauth-android-codelab/" + >the codelab</a>. </p> <h2 id="testing">Test your App with Android for Work</h2> @@ -467,7 +471,7 @@ android.app.extra.PROVISIONING_TIME_ZONE=America/New_York</pre> <li>Follow the onscreen instructions to set up your target device.</li> <li>Once you’ve completed provisioning the device owner, you can test your app on that device. You should specifically test how - <a href="{@docRoot}work/app-restrictions.html">app restrictions</a>, + <a href="{@docRoot}work/managed-configurations.html">managed configurations</a>, <a href="{@docRoot}work/managed-profiles.html#sharing_files">URIs</a>, and <a href="{@docRoot}work/managed-profiles.html#prevent_failed_intents">intents</a> work on that device.</li> @@ -484,7 +488,7 @@ android.app.extra.PROVISIONING_TIME_ZONE=America/New_York</pre> <ul> <li>App distribution through Play</li> - <li>Server-side app restriction configuration</li> + <li>Server-side managed configuration</li> <li>Server-side profile policy control</li> </ul> @@ -510,7 +514,7 @@ android.app.extra.PROVISIONING_TIME_ZONE=America/New_York</pre> <ol> <li>Set up work devices.</li> <li>Distribute your application.</li> - <li>Set application restrictions.</li> + <li>Set managed configuration.</li> <li>Set device policies.</li> </ol> </ol> diff --git a/docs/html/work/app-restrictions.jd b/docs/html/work/managed-configurations.jd index 4122988b873e..dc3ef0da2ab2 100644 --- a/docs/html/work/app-restrictions.jd +++ b/docs/html/work/managed-configurations.jd @@ -1,5 +1,5 @@ -page.title=Set up App Restrictions -page.metaDescription=Learn how to implement app restrictions and configuration settings that can be changed by other apps on the same device. +page.title=Set up Managed Configurations +page.metaDescription=Learn how to implement managed configurations that can be changed by other apps on the same device. page.image=images/work/cards/briefcase_600px.png @jd:body @@ -8,18 +8,21 @@ page.image=images/work/cards/briefcase_600px.png <div id="qv"> <h2>In this document</h2> <ol> - <li><a href="#define_restrictions">Define App Restrictions</a></li> - <li><a href="#check_restrictions">Check App Restrictions</a></li> - <li><a href="#listen">Listen for App Restriction Changes</a></li> + <li><a href="#define-configuration">Define Managed Configurations</a></li> + <li><a href="#check-configuration">Check Managed Configurations</a></li> + <li><a href="#listen-configuration">Listen for Managed Configuration Changes</a></li> </ol> </div> </div> -<p>If you are developing apps for the enterprise market, you may need to satisfy -particular requirements set by a company's policies. Application restrictions -allow the enterprise administrator to remotely specify settings for apps. -This capability is particularly useful for enterprise-approved apps deployed to -a managed profile.</p> +<p> + If you are developing apps for the enterprise market, you may need + to satisfy particular requirements set by a company's policies. + Managed configurations, previously known as <em>application restrictions</em>, + allow the enterprise administrator to remotely specify settings for + apps. This capability is particularly useful for enterprise-approved + apps deployed to a managed profile. +</p> <p>For example, an enterprise might require that approved apps allow the enterprise administrator to:</p> @@ -48,55 +51,55 @@ enterprise administrator to:</p> </h2> <p> - Apps define the restrictions and configuration options that can be remotely - set by an administrator. These restrictions are - arbitrary configuration settings that can be changed by a restrictions - provider. If your app is running on an enterprise device's managed - profile, the enterprise administrator can change your app's restrictions. + Apps define the managed configuration options that can be remotely + set by an administrator. These are arbitrary settings that can be + changed by a managed configuration provider. If your app is running on an + enterprise device's managed profile, the enterprise administrator + can change your app's managed configuration. </p> <p> - The restrictions provider is another app running on the same device. + The managed configurations provider is another app running on the same device. This app is typically controlled by the enterprise administrator. The - enterprise administrator communicates restriction changes to the restrictions - provider app. That app, in turn, changes the restrictions on your app. + enterprise administrator communicates configuration changes to the managed + configuration provider app. That app, in turn, changes the configurations on your app. </p> <p> - To provide externally configurable restrictions: + To provide externally managed configurations: </p> <ul> - <li>Declare the restrictions in your app manifest. Doing so allows the - enterprise administrator to read the app's restrictions through Google - Play APIs. + <li>Declare the managed configurations in your app manifest. Doing + so allows the enterprise administrator to read the app's + configurations through Google Play APIs. </li> <li>Whenever the app resumes, use the {@link android.content.RestrictionsManager} object to check the current - restrictions, and change your app's UI and behavior to conform with those - restrictions. + managed configurations, and change your app's UI and behavior to + conform with those configurations. </li> <li>Listen for the {@link android.content.Intent#ACTION_APPLICATION_RESTRICTIONS_CHANGED ACTION_APPLICATION_RESTRICTIONS_CHANGED} intent. When you receive this broadcast, check the {@link android.content.RestrictionsManager} to see what - the current restrictions are, and make any necessary changes to your app's - behavior. + the current managed configurations are, and make any necessary changes to your + app's behavior. </li> </ul> -<h2 id="define_restrictions"> - Define App Restrictions +<h2 id="define-configuration"> + Define Managed Configurations </h2> <p> - Your app can support any restrictions you want to define. You declare the - app's restrictions in a <em>restrictions file</em>, and declare the - restrictions file in the manifest. Creating a restrictions file allows other - apps to examine the restrictions your app provides. Enterprise Mobility - Management (EMM) partners can read your app's restrictions by using Google + Your app can support any managed configuration you want to define. You declare the + app's managed configurations in a <em>managed configurations file</em>, and declare the + configurations file in the manifest. Creating a configurations file allows other + apps to examine the managed configurations your app provides. Enterprise Mobility + Management (EMM) partners can read your app's configurations by using Google Play APIs. </p> @@ -121,15 +124,17 @@ enterprise administrator to:</p> </p> <p class="note"> - <strong>Note:</strong> Do not create localized versions of the restrictions - file. Your app is only allowed to have a single restrictions file, - so restrictions will be consistent for your app in all locales. + <strong>Note:</strong> Do not create localized versions of the + managed configuration file. Your app is only allowed to have a + single managed configurations file, so configurations will be + consistent for your app in all locales. </p> <p> - In an enterprise environment, an EMM will typically use the restrictions - schema to generate a remote console for IT administrators, so the - administrators can remotely configure your application. + In an enterprise environment, an EMM will typically use the managed + configuration schema to generate a remote console for IT + administrators, so the administrators can remotely configure your + application. </p> <p> @@ -158,10 +163,10 @@ enterprise administrator to:</p> </p> <p> - You use each restriction's <code>android:key</code> attribute to read its - value from a restrictions bundle. For this reason, each restriction must have - a unique key string, and the string <em>cannot</em> be localized. It must be - specified with a string literal. + You use each configuration's <code>android:key</code> attribute to + read its value from a managed configuration bundle. For this reason, + each configuration must have a unique key string, and the string + <em>cannot</em> be localized. It must be specified with a string literal. </p> <p class="note"> @@ -173,27 +178,29 @@ enterprise administrator to:</p> </p> <p> - The restrictions provider can query the app to find details on the app's - available restrictions, including their description text. Restrictions - providers and enterprise administrators can change your app's restrictions at - any time, even when the app is not running. + The managed configuration provider can query the app to find details + on the app's available configurations, including their description + text. Configurations providers and enterprise administrators can + change your app's managed configurations at any time, even when the + app is not running. </p> -<h2 id="check_restrictions"> - Check App Restrictions +<h2 id="check-configuration"> + Check Managed Configurations </h2> <p> - Your app is not automatically notified when other apps change its restriction - settings. Instead, you need to check what the restrictions are when your app - starts or resumes, and listen for a system intent to find out if the - restrictions change while your app is running. + Your app is not automatically notified when other apps change its + configuration settings. Instead, you need to check what the managed + configurations are when your app starts or resumes, and listen for a + system intent to find out if the configurations change while your + app is running. </p> <p> - To find out the current restriction settings, your app uses a {@link - android.content.RestrictionsManager} object. Your app should check for the - current restrictions at the following times: + To find out the current configuration settings, your app uses a + {@link android.content.RestrictionsManager} object. Your app should + check for the current managed configurations at the following times: </p> <ul> @@ -201,8 +208,8 @@ enterprise administrator to:</p> {@link android.app.Activity#onResume onResume()} method </li> - <li>When the app is notified of a restriction change, as described in - <a href="#listen">Listen for Device Configuration + <li>When the app is notified of a configuration change, as described in + <a href="#listen-configuration">Listen for Managed Configuration Changes</a> </li> </ul> @@ -219,8 +226,8 @@ enterprise administrator to:</p> .getSystemService(Context.RESTRICTIONS_SERVICE);</pre> <p> - Once you have a {@link android.content.RestrictionsManager}, you can get the current restrictions - settings by calling its + Once you have a {@link android.content.RestrictionsManager}, you can get the + current configuration settings by calling its {@link android.content.RestrictionsManager#getApplicationRestrictions getApplicationRestrictions()} method: </p> @@ -229,8 +236,8 @@ enterprise administrator to:</p> <p class="note"> <strong>Note:</strong> For convenience, you can also fetch the current - restrictions with a {@link android.os.UserManager}, by calling {@link - android.os.UserManager#getApplicationRestrictions + configurations with a {@link android.os.UserManager}, by calling + {@link android.os.UserManager#getApplicationRestrictions UserManager.getApplicationRestrictions()}. This method behaves exactly the same as {@link android.content.RestrictionsManager#getApplicationRestrictions RestrictionsManager.getApplicationRestrictions()}. @@ -240,46 +247,46 @@ enterprise administrator to:</p> The {@link android.content.RestrictionsManager#getApplicationRestrictions getApplicationRestrictions()} method requires reading from data storage, so it should be done sparingly. Do not call this method every time you need to - know the current restrictions. Instead, you should call it once when your app - starts or resumes, and cache the fetched restrictions bundle. Then listen for - the {@link android.content.Intent#ACTION_APPLICATION_RESTRICTIONS_CHANGED - ACTION_APPLICATION_RESTRICTIONS_CHANGED} intent to find out if restrictions - change while your app is active, as described in <a href="#listen">Listen for - Device Configuration Changes</a>. + know the current configuration. Instead, you should call it once when your app + starts or resumes, and cache the fetched managed configurations bundle. Then listen + for the {@link android.content.Intent#ACTION_APPLICATION_RESTRICTIONS_CHANGED + ACTION_APPLICATION_RESTRICTIONS_CHANGED} intent to find out if the configuration + change while your app is active, as described in + <a href="#listen-configuration">Listen for Managed Configuration Changes</a>. </p> -<h3 id="read_restrictions"> - Reading and applying restrictions +<h3 id="read-configurations"> + Reading and applying managed configurations </h3> <p> The {@link android.content.RestrictionsManager#getApplicationRestrictions getApplicationRestrictions()} method returns a {@link android.os.Bundle} - containing a key-value pair for each restriction that has been set. The + containing a key-value pair for each configuration that has been set. The values are all of type <code>Boolean</code>, <code>int</code>, <code>String</code>, and <code>String[]</code>. Once you have the - restrictions {@link android.os.Bundle}, you can check the current - restrictions settings with the standard {@link android.os.Bundle} methods for + managed configurations {@link android.os.Bundle}, you can check the current + configuration settings with the standard {@link android.os.Bundle} methods for those data types, such as {@link android.os.Bundle#getBoolean getBoolean()} or {@link android.os.Bundle#getString getString()}. </p> <p class="note"> - <strong>Note:</strong> The restrictions {@link android.os.Bundle} contains - one item for every restriction that has been explicitly set by a restrictions - provider. However, you <em>cannot</em> assume that a restriction will be - present in the bundle just because you defined a default value in the - restrictions XML file. + <strong>Note:</strong> The managed configurations {@link android.os.Bundle} + contains one item for every configuration that has been explicitly set by a + managed configurations provider. However, you <em>cannot</em> assume that a + configuration will be present in the bundle just because you defined a default + value in the managed configurations XML file. </p> <p> It is up to your app to take appropriate action based on the current - restrictions settings. For example, if your app has a restriction specifying - whether it can download data over a cellular connection, and you find that - the restriction is set to <code>false</code>, you would have to disable data - download except when the device has a Wi-Fi connection, as shown in the - following example code: + managed configuration settings. For example, if your app has a + configuration specifying whether it can download data over a + cellular connection, and you find that the configuration is set to + <code>false</code>, you would have to disable data download except when + the device has a Wi-Fi connection, as shown in the following example code: </p> <pre> @@ -298,15 +305,15 @@ if (!appCanUseCellular) { // ...show appropriate notices to user }</pre> -<h2 id="listen"> - Listen for App Restriction Changes +<h2 id="listen-configuration"> + Listen for Managed Configuration Changes </h2> <p> - Whenever an app's restrictions are changed, the system fires the + Whenever an app's managed configurations are changed, the system fires the {@link android.content.Intent#ACTION_APPLICATION_RESTRICTIONS_CHANGED ACTION_APPLICATION_RESTRICTIONS_CHANGED} intent. Your app has to listen for - this intent so you can change the app's behavior when the restriction settings + this intent so you can change the app's behavior when the configuration settings change.</p> <p class="note"> @@ -327,26 +334,22 @@ if (!appCanUseCellular) { BroadcastReceiver restrictionsReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { - // Get the current restrictions bundle - Bundle <code>appRestrictions</code> = + // Get the current configuration bundle + Bundle appRestrictions = myRestrictionsMgr.getApplicationRestrictions(); - myRestrictionsMgr.getApplicationRestrictions(); - - // Check current restrictions settings, change your app's UI and + // Check current configuration settings, change your app's UI and // functionality as necessary. - } - }; registerReceiver(restrictionsReceiver, restrictionsFilter); </pre> <p class="note"> <strong>Note:</strong> Ordinarily, your app does not need to be notified - about restriction changes when it is paused. Instead, you should unregister + about configuration changes when it is paused. Instead, you should unregister your broadcast receiver when the app is paused. When the app resumes, you - first check for the current restrictions (as discussed in <a href= - "#check_restrictions">Check Device Restrictions</a>), then register your - broadcast receiver to make sure you're notified about restriction changes + first check for the current managed configurations (as discussed in + <a href="#check-configuration">Check Managed Configurations</a>), then register + your broadcast receiver to make sure you're notified about configuration changes that happen while the app is active. </p> diff --git a/docs/html/work/work_toc.cs b/docs/html/work/work_toc.cs deleted file mode 100644 index 10658c2e25d8..000000000000 --- a/docs/html/work/work_toc.cs +++ /dev/null @@ -1,44 +0,0 @@ -<ul id="nav"> - - <li class="nav-section"> - <div class="nav-section-header empty"> - <a href="<?cs var:toroot ?>work/index.html"> - Android for Work Home</a> - </div> - </li> - - <li class="nav-section"> - <div class="nav-section-header empty"> - <a href="<?cs var:toroot ?>work/overview.html"> - Overview</a> - </div> - </li> - - <li class="nav-section"> - <div class="nav-section-header empty"> - <a href="<?cs var:toroot ?>work/guide.html"> - Developer Guide</a> - </div> - </li> - - <li class="nav-section"> - <div class="nav-section-header empty"> - <a href="<?cs var:toroot ?>work/managed-profiles.html"> - Set up Managed Profiles</a></div> - </li> - - <li class="nav-section"> - <div class="nav-section-header empty"> - <a href="<?cs var:toroot ?>work/app-restrictions.html"> - Set up App Restrictions</a> - </div> - </li> - - <li class="nav-section"> - <div class="nav-section-header empty"> - <a href="<?cs var:toroot ?>work/cosu.html"> - Set up Single-Purpose Devices</a> - </div> - </li> - -</ul> diff --git a/graphics/java/android/graphics/drawable/DrawableContainer.java b/graphics/java/android/graphics/drawable/DrawableContainer.java index 8971004f0f72..c6977746f64e 100644 --- a/graphics/java/android/graphics/drawable/DrawableContainer.java +++ b/graphics/java/android/graphics/drawable/DrawableContainer.java @@ -500,34 +500,44 @@ public class DrawableContainer extends Drawable implements Drawable.Callback { * @param d The drawable to initialize. */ private void initializeDrawableForDisplay(Drawable d) { - if (mDrawableContainerState.mEnterFadeDuration <= 0 && mHasAlpha) { - d.setAlpha(mAlpha); - } - - if (mDrawableContainerState.mHasColorFilter) { - // Color filter always overrides tint. - d.setColorFilter(mDrawableContainerState.mColorFilter); - } else { - if (mDrawableContainerState.mHasTintList) { - d.setTintList(mDrawableContainerState.mTintList); + // Temporary fix for suspending callbacks during initialization. We + // don't want any of these setters causing an invalidate() since that + // may call back into DrawableContainer. + final Callback cb = d.getCallback(); + d.setCallback(null); + + try { + if (mDrawableContainerState.mEnterFadeDuration <= 0 && mHasAlpha) { + d.setAlpha(mAlpha); } - if (mDrawableContainerState.mHasTintMode) { - d.setTintMode(mDrawableContainerState.mTintMode); - } - } - d.setVisible(isVisible(), true); - d.setDither(mDrawableContainerState.mDither); - d.setState(getState()); - d.setLevel(getLevel()); - d.setBounds(getBounds()); - d.setLayoutDirection(getLayoutDirection()); - d.setAutoMirrored(mDrawableContainerState.mAutoMirrored); + if (mDrawableContainerState.mHasColorFilter) { + // Color filter always overrides tint. + d.setColorFilter(mDrawableContainerState.mColorFilter); + } else { + if (mDrawableContainerState.mHasTintList) { + d.setTintList(mDrawableContainerState.mTintList); + } + if (mDrawableContainerState.mHasTintMode) { + d.setTintMode(mDrawableContainerState.mTintMode); + } + } - final Rect hotspotBounds = mHotspotBounds; - if (hotspotBounds != null) { - d.setHotspotBounds(hotspotBounds.left, hotspotBounds.top, - hotspotBounds.right, hotspotBounds.bottom); + d.setVisible(isVisible(), true); + d.setDither(mDrawableContainerState.mDither); + d.setState(getState()); + d.setLevel(getLevel()); + d.setBounds(getBounds()); + d.setLayoutDirection(getLayoutDirection()); + d.setAutoMirrored(mDrawableContainerState.mAutoMirrored); + + final Rect hotspotBounds = mHotspotBounds; + if (hotspotBounds != null) { + d.setHotspotBounds(hotspotBounds.left, hotspotBounds.top, + hotspotBounds.right, hotspotBounds.bottom); + } + } finally { + d.setCallback(cb); } } diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java index dd33e98cddf1..f5592fa7e407 100644 --- a/graphics/java/android/graphics/drawable/VectorDrawable.java +++ b/graphics/java/android/graphics/drawable/VectorDrawable.java @@ -804,7 +804,7 @@ public class VectorDrawable extends Drawable { mTintMode = copy.mTintMode; mAutoMirrored = copy.mAutoMirrored; mRootGroup = new VGroup(copy.mRootGroup, mVGTargetsMap); - createNativeTree(mRootGroup); + createNativeTreeFromCopy(copy, mRootGroup); mBaseWidth = copy.mBaseWidth; mBaseHeight = copy.mBaseHeight; @@ -826,6 +826,16 @@ public class VectorDrawable extends Drawable { VMRuntime.getRuntime().registerNativeAllocation(NATIVE_ALLOCATION_SIZE); } + // Create a new native tree with the given root group, and copy the properties from the + // given VectorDrawableState's native tree. + private void createNativeTreeFromCopy(VectorDrawableState copy, VGroup rootGroup) { + mNativeTree = new VirtualRefBasePtr(nCreateTreeFromCopy( + copy.mNativeTree.get(), rootGroup.mNativePtr)); + // Register tree size + VMRuntime.getRuntime().registerNativeAllocation(NATIVE_ALLOCATION_SIZE); + } + + void onTreeConstructionFinished() { mRootGroup.setTree(mNativeTree); mAllocationOfAllNodes = mRootGroup.getNativeSize(); @@ -1777,6 +1787,7 @@ public class VectorDrawable extends Drawable { } private static native long nCreateTree(long rootGroupPtr); + private static native long nCreateTreeFromCopy(long treeToCopy, long rootGroupPtr); private static native void nSetRendererViewportSize(long rendererPtr, float viewportWidth, float viewportHeight); private static native boolean nSetRootAlpha(long rendererPtr, float alpha); diff --git a/libs/hwui/BakedOpDispatcher.cpp b/libs/hwui/BakedOpDispatcher.cpp index 59c106578cf3..8b3f1722dddf 100644 --- a/libs/hwui/BakedOpDispatcher.cpp +++ b/libs/hwui/BakedOpDispatcher.cpp @@ -805,27 +805,21 @@ void BakedOpDispatcher::onLayerOp(BakedOpRenderer& renderer, const LayerOp& op, // Note that we don't use op->paint in this function - it's never set on a LayerOp OffscreenBuffer* buffer = *op.layerHandle; - if (CC_UNLIKELY(!buffer)) { - // Layer was not allocated, which can occur if there were no draw ops inside. We draw the - // equivalent by drawing a rect with the same layer properties (alpha/xfer/filter). - int color = SkColorSetA(SK_ColorTRANSPARENT, op.alpha * 255); - renderRectForLayer(renderer, op, state, - color, op.mode, op.colorFilter); - } else { - float layerAlpha = op.alpha * state.alpha; - Glop glop; - GlopBuilder(renderer.renderState(), renderer.caches(), &glop) - .setRoundRectClipState(state.roundRectClipState) - .setMeshTexturedIndexedVbo(buffer->vbo, buffer->elementCount) - .setFillLayer(buffer->texture, op.colorFilter, layerAlpha, op.mode, Blend::ModeOrderSwap::NoSwap) - .setTransform(state.computedState.transform, TransformFlags::None) - .setModelViewOffsetRectSnap(op.unmappedBounds.left, op.unmappedBounds.top, - Rect(op.unmappedBounds.getWidth(), op.unmappedBounds.getHeight())) - .build(); - renderer.renderGlop(state, glop); - } + if (CC_UNLIKELY(!buffer)) return; + + float layerAlpha = op.alpha * state.alpha; + Glop glop; + GlopBuilder(renderer.renderState(), renderer.caches(), &glop) + .setRoundRectClipState(state.roundRectClipState) + .setMeshTexturedIndexedVbo(buffer->vbo, buffer->elementCount) + .setFillLayer(buffer->texture, op.colorFilter, layerAlpha, op.mode, Blend::ModeOrderSwap::NoSwap) + .setTransform(state.computedState.transform, TransformFlags::None) + .setModelViewOffsetRectSnap(op.unmappedBounds.left, op.unmappedBounds.top, + Rect(op.unmappedBounds.getWidth(), op.unmappedBounds.getHeight())) + .build(); + renderer.renderGlop(state, glop); - if (buffer && !buffer->hasRenderedSinceRepaint) { + if (!buffer->hasRenderedSinceRepaint) { buffer->hasRenderedSinceRepaint = true; if (CC_UNLIKELY(Properties::debugLayersUpdates)) { // render debug layer highlight diff --git a/libs/hwui/BakedOpRenderer.cpp b/libs/hwui/BakedOpRenderer.cpp index eed012636bb4..ea2e15b54b2f 100644 --- a/libs/hwui/BakedOpRenderer.cpp +++ b/libs/hwui/BakedOpRenderer.cpp @@ -96,15 +96,15 @@ void BakedOpRenderer::endLayer() { } OffscreenBuffer* BakedOpRenderer::copyToLayer(const Rect& area) { - OffscreenBuffer* buffer = mRenderState.layerPool().get(mRenderState, - area.getWidth(), area.getHeight()); - if (!area.isEmpty()) { + const uint32_t width = area.getWidth(); + const uint32_t height = area.getHeight(); + OffscreenBuffer* buffer = mRenderState.layerPool().get(mRenderState, width, height); + if (!area.isEmpty() && width != 0 && height != 0) { mCaches.textureState().activateTexture(0); mCaches.textureState().bindTexture(buffer->texture.id()); glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, - area.left, mRenderTarget.viewportHeight - area.bottom, - area.getWidth(), area.getHeight()); + area.left, mRenderTarget.viewportHeight - area.bottom, width, height); } return buffer; } diff --git a/libs/hwui/VectorDrawable.cpp b/libs/hwui/VectorDrawable.cpp index f0348e4977ae..2b7994139641 100644 --- a/libs/hwui/VectorDrawable.cpp +++ b/libs/hwui/VectorDrawable.cpp @@ -530,7 +530,7 @@ SkPaint* Tree::updatePaint(SkPaint* outPaint, TreeProperties* prop) { if (prop->getRootAlpha() == 1.0f && prop->getColorFilter() == nullptr) { return nullptr; } else { - outPaint->setColorFilter(mStagingProperties.getColorFilter()); + outPaint->setColorFilter(prop->getColorFilter()); outPaint->setFilterQuality(kLow_SkFilterQuality); outPaint->setAlpha(prop->getRootAlpha() * 255); return outPaint; diff --git a/libs/hwui/VectorDrawable.h b/libs/hwui/VectorDrawable.h index b33f26c1a79d..a5d1d4b86673 100644 --- a/libs/hwui/VectorDrawable.h +++ b/libs/hwui/VectorDrawable.h @@ -542,6 +542,12 @@ public: Tree(Group* rootNode) : mRootNode(rootNode) { mRootNode->setPropertyChangedListener(&mPropertyChangedListener); } + + // Copy properties from the tree and use the give node as the root node + Tree(const Tree* copy, Group* rootNode) : Tree(rootNode) { + mStagingProperties.syncAnimatableProperties(*copy->stagingProperties()); + mStagingProperties.syncNonAnimatableProperties(*copy->stagingProperties()); + } // Draws the VD onto a bitmap cache, then the bitmap cache will be rendered onto the input // canvas. Returns the number of pixels needed for the bitmap cache. int draw(Canvas* outCanvas, SkColorFilter* colorFilter, @@ -666,7 +672,7 @@ public: }; void onPropertyChanged(TreeProperties* prop); TreeProperties* mutateStagingProperties() { return &mStagingProperties; } - const TreeProperties* stagingProperties() { return &mStagingProperties; } + const TreeProperties* stagingProperties() const { return &mStagingProperties; } PushStagingFunctor* getFunctor() { return &mFunctor;} // This should only be called from animations on RT diff --git a/libs/hwui/tests/unit/BakedOpDispatcherTests.cpp b/libs/hwui/tests/unit/BakedOpDispatcherTests.cpp index 01d3d7066ae3..6b7b721eaec6 100644 --- a/libs/hwui/tests/unit/BakedOpDispatcherTests.cpp +++ b/libs/hwui/tests/unit/BakedOpDispatcherTests.cpp @@ -53,7 +53,7 @@ private: typedef void (*TestBakedOpReceiver)(BakedOpRenderer&, const BakedOpState&); static void testUnmergedGlopDispatch(renderthread::RenderThread& renderThread, RecordedOp* op, - std::function<void(const Glop& glop)> glopVerifier) { + std::function<void(const Glop& glop)> glopVerifier, int expectedGlopCount = 1) { // Create op, and wrap with basic state. LinearAllocator allocator; auto snapshot = TestUtils::makeSnapshot(Matrix4::identity(), Rect(100, 100)); @@ -61,8 +61,8 @@ static void testUnmergedGlopDispatch(renderthread::RenderThread& renderThread, R ASSERT_NE(nullptr, state); int glopCount = 0; - auto glopReceiver = [&glopVerifier, &glopCount] (const Glop& glop) { - ASSERT_EQ(glopCount++, 0) << "Only one Glop expected"; + auto glopReceiver = [&glopVerifier, &glopCount, &expectedGlopCount] (const Glop& glop) { + ASSERT_LE(glopCount++, expectedGlopCount) << expectedGlopCount << "glop(s) expected"; glopVerifier(glop); }; ValidatingBakedOpRenderer renderer(renderThread.renderState(), glopReceiver); @@ -75,7 +75,8 @@ static void testUnmergedGlopDispatch(renderthread::RenderThread& renderThread, R static TestBakedOpReceiver unmergedReceivers[] = BUILD_RENDERABLE_OP_LUT(X); #undef X unmergedReceivers[op->opId](renderer, *state); - ASSERT_EQ(1, glopCount) << "Exactly one Glop expected"; + ASSERT_EQ(expectedGlopCount, glopCount) << "Exactly " << expectedGlopCount + << "Glop(s) expected"; } RENDERTHREAD_TEST(BakedOpDispatcher, pathTexture_positionOvalArc) { @@ -119,12 +120,8 @@ RENDERTHREAD_TEST(BakedOpDispatcher, onLayerOp_bufferless) { OffscreenBuffer* buffer = nullptr; // no providing a buffer, should hit rect fallback case LayerOp op(Rect(10, 10), Matrix4::identity(), nullptr, &layerPaint, &buffer); testUnmergedGlopDispatch(renderThread, &op, [&renderThread] (const Glop& glop) { - // rect glop is dispatched with paint props applied - EXPECT_EQ(renderThread.renderState().meshState().getUnitQuadVBO(), - glop.mesh.vertices.bufferObject) << "Unit quad should be drawn"; - EXPECT_EQ(nullptr, glop.fill.texture.texture) << "Should be no texture when layer is null"; - EXPECT_FLOAT_EQ(128 / 255.0f, glop.fill.color.a) << "Rect quad should use op alpha"; - }); + ADD_FAILURE() << "Nothing should happen"; + }, 0); } static int getGlopTransformFlags(renderthread::RenderThread& renderThread, RecordedOp* op) { diff --git a/media/java/android/media/AudioAttributes.java b/media/java/android/media/AudioAttributes.java index a3bbdfcb2627..5286f8fa5ad3 100644 --- a/media/java/android/media/AudioAttributes.java +++ b/media/java/android/media/AudioAttributes.java @@ -225,9 +225,20 @@ public final class AudioAttributes implements Parcelable { public final static int FLAG_BYPASS_MUTE = 0x1 << 7; /** - * Flag requesting a low latency path. + * Flag requesting a low latency path when creating an AudioTrack. * When using this flag, the sample rate must match the native sample rate * of the device. Effects processing is also unavailable. + * + * Note that if this flag is used without specifying a bufferSizeInBytes then the + * AudioTrack's actual buffer size may be too small. It is recommended that a fairly + * large buffer should be specified when the AudioTrack is created. + * Then the actual size can be reduced by calling + * {@link AudioTrack#setBufferSizeInFrames(int)}. The buffer size can be optimized + * by lowering it after each write() call until the audio glitches, which is detected by calling + * {@link AudioTrack#getUnderrunCount()}. Then the buffer size can be increased + * until there are no glitches. + * This tuning step should be done while playing silence. + * This technique provides a compromise between latency and glitch rate. */ public final static int FLAG_LOW_LATENCY = 0x1 << 8; diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java index 349d67ec9145..45d0cc025a16 100644 --- a/media/java/android/media/MediaCodecInfo.java +++ b/media/java/android/media/MediaCodecInfo.java @@ -591,7 +591,12 @@ public final class MediaCodecInfo { } } levelCaps = createFromProfileLevel(mMime, profile, maxLevel); - if (levelCaps != null && !levelCaps.isFormatSupported(format)) { + // remove profile from this format otherwise levelCaps.isFormatSupported will + // get into this same conditon and loop forever. + Map<String, Object> mapWithoutProfile = new HashMap<>(map); + mapWithoutProfile.remove(MediaFormat.KEY_PROFILE); + MediaFormat formatWithoutProfile = new MediaFormat(mapWithoutProfile); + if (levelCaps != null && !levelCaps.isFormatSupported(formatWithoutProfile)) { return false; } } @@ -646,6 +651,27 @@ public final class MediaCodecInfo { continue; } } + + // MPEG4 levels are not completely ordered: + // Level1 support only implies Level0 (and not Level0b) support + if (mMime.equalsIgnoreCase(MediaFormat.MIMETYPE_VIDEO_MPEG4)) { + if (pl.level != level && pl.level == CodecProfileLevel.MPEG4Level1 + && level > CodecProfileLevel.MPEG4Level0) { + continue; + } + } + + // HEVC levels incorporate both tiers and levels. Verify tier support. + if (mMime.equalsIgnoreCase(MediaFormat.MIMETYPE_VIDEO_HEVC)) { + boolean supportsHighTier = + (pl.level & CodecProfileLevel.HEVCHighTierLevels) != 0; + boolean checkingHighTier = (level & CodecProfileLevel.HEVCHighTierLevels) != 0; + // high tier levels are only supported by other high tier levels + if (checkingHighTier && !supportsHighTier) { + continue; + } + } + if (pl.level >= level) { // if we recognize the listed profile/level, we must also recognize the // profile/level arguments. @@ -745,6 +771,9 @@ public final class MediaCodecInfo { * Retrieve the codec capabilities for a certain {@code mime type}, {@code * profile} and {@code level}. If the type, or profile-level combination * is not understood by the framework, it returns null. + * <p class=note> In {@link android.os.Build.VERSION_CODES#M}, calling this + * method without calling any method of the {@link MediaCodecList} class beforehand + * results in a {@link NullPointerException}.</p> */ public static CodecCapabilities createFromProfileLevel( String mime, int profile, int level) { @@ -1124,6 +1153,8 @@ public final class MediaCodecInfo { private int mHeightAlignment; private int mSmallerDimensionUpperLimit; + private boolean mAllowMbOverride; // allow XML to override calculated limits + /** * Returns the range of supported bitrates in bits/second. */ @@ -1688,7 +1719,7 @@ public final class MediaCodecInfo { Long.MAX_VALUE, blockSize.getWidth(), blockSize.getHeight(), alignment.getWidth(), alignment.getHeight()); - if ((mParent.mError & ERROR_UNSUPPORTED) != 0) { + if ((mParent.mError & ERROR_UNSUPPORTED) != 0 || mAllowMbOverride) { // codec supports profiles that we don't know. // Use supplied values clipped to platform limits if (widths != null) { @@ -1720,7 +1751,12 @@ public final class MediaCodecInfo { mFrameRateRange = FRAME_RATE_RANGE.intersect(frameRates); } if (bitRates != null) { - mBitrateRange = BITRATE_RANGE.intersect(bitRates); + // only allow bitrate override if unsupported profiles were encountered + if ((mParent.mError & ERROR_UNSUPPORTED) != 0) { + mBitrateRange = BITRATE_RANGE.intersect(bitRates); + } else { + mBitrateRange = mBitrateRange.intersect(bitRates); + } } } else { // no unsupported profile/levels, so restrict values to known limits @@ -1875,6 +1911,19 @@ public final class MediaCodecInfo { int maxBlocks, long maxBlocksPerSecond, int blockWidth, int blockHeight, int widthAlignment, int heightAlignment) { + applyMacroBlockLimits( + 1 /* minHorizontalBlocks */, 1 /* minVerticalBlocks */, + maxHorizontalBlocks, maxVerticalBlocks, + maxBlocks, maxBlocksPerSecond, + blockWidth, blockHeight, widthAlignment, heightAlignment); + } + + private void applyMacroBlockLimits( + int minHorizontalBlocks, int minVerticalBlocks, + int maxHorizontalBlocks, int maxVerticalBlocks, + int maxBlocks, long maxBlocksPerSecond, + int blockWidth, int blockHeight, + int widthAlignment, int heightAlignment) { applyAlignment(widthAlignment, heightAlignment); applyBlockLimits( blockWidth, blockHeight, Range.create(1, maxBlocks), @@ -1884,10 +1933,12 @@ public final class MediaCodecInfo { new Rational(maxHorizontalBlocks, 1))); mHorizontalBlockRange = mHorizontalBlockRange.intersect( - 1, maxHorizontalBlocks / (mBlockWidth / blockWidth)); + Utils.divUp(minHorizontalBlocks, (mBlockWidth / blockWidth)), + maxHorizontalBlocks / (mBlockWidth / blockWidth)); mVerticalBlockRange = mVerticalBlockRange.intersect( - 1, maxVerticalBlocks / (mBlockHeight / blockHeight)); + Utils.divUp(minVerticalBlocks, (mBlockHeight / blockHeight)), + maxVerticalBlocks / (mBlockHeight / blockHeight)); } private void applyLevelLimits() { @@ -1997,7 +2048,7 @@ public final class MediaCodecInfo { case CodecProfileLevel.MPEG2ProfileSimple: switch (profileLevel.level) { case CodecProfileLevel.MPEG2LevelML: - FR = 30; W = 45; H = 36; MBPS = 48600; FS = 1620; BR = 15000; break; + FR = 30; W = 45; H = 36; MBPS = 40500; FS = 1620; BR = 15000; break; default: Log.w(TAG, "Unrecognized profile/level " + profileLevel.profile + "/" @@ -2010,7 +2061,7 @@ public final class MediaCodecInfo { case CodecProfileLevel.MPEG2LevelLL: FR = 30; W = 22; H = 18; MBPS = 11880; FS = 396; BR = 4000; break; case CodecProfileLevel.MPEG2LevelML: - FR = 30; W = 45; H = 36; MBPS = 48600; FS = 1620; BR = 15000; break; + FR = 30; W = 45; H = 36; MBPS = 40500; FS = 1620; BR = 15000; break; case CodecProfileLevel.MPEG2LevelH14: FR = 60; W = 90; H = 68; MBPS = 183600; FS = 6120; BR = 60000; break; case CodecProfileLevel.MPEG2LevelHL: @@ -2060,16 +2111,19 @@ public final class MediaCodecInfo { maxBps = 64000; for (CodecProfileLevel profileLevel: profileLevels) { int MBPS = 0, FS = 0, BR = 0, FR = 0, W = 0, H = 0; + boolean strict = false; // true: W, H and FR are individual max limits boolean supported = true; switch (profileLevel.profile) { case CodecProfileLevel.MPEG4ProfileSimple: switch (profileLevel.level) { case CodecProfileLevel.MPEG4Level0: + strict = true; FR = 15; W = 11; H = 9; MBPS = 1485; FS = 99; BR = 64; break; case CodecProfileLevel.MPEG4Level1: FR = 30; W = 11; H = 9; MBPS = 1485; FS = 99; BR = 64; break; case CodecProfileLevel.MPEG4Level0b: - FR = 30; W = 11; H = 9; MBPS = 1485; FS = 99; BR = 128; break; + strict = true; + FR = 15; W = 11; H = 9; MBPS = 1485; FS = 99; BR = 128; break; case CodecProfileLevel.MPEG4Level2: FR = 30; W = 22; H = 18; MBPS = 5940; FS = 396; BR = 128; break; case CodecProfileLevel.MPEG4Level3: @@ -2117,11 +2171,16 @@ public final class MediaCodecInfo { case CodecProfileLevel.MPEG4ProfileCore: // 1-2 case CodecProfileLevel.MPEG4ProfileAdvancedCore: // 1-4 case CodecProfileLevel.MPEG4ProfileSimpleScalable: // 0-2 - case CodecProfileLevel.MPEG4ProfileAdvancedScalable: // 1-3 case CodecProfileLevel.MPEG4ProfileHybrid: // 1-2 + + // Studio profiles are not supported by our codecs. + + // Only profiles that can decode simple object types are considered. + // The following profiles are not able to. case CodecProfileLevel.MPEG4ProfileBasicAnimated: // 1-2 case CodecProfileLevel.MPEG4ProfileScalableTexture: // 1 case CodecProfileLevel.MPEG4ProfileSimpleFace: // 1-2 + case CodecProfileLevel.MPEG4ProfileAdvancedScalable: // 1-3 case CodecProfileLevel.MPEG4ProfileSimpleFBA: // 1-2 Log.i(TAG, "Unsupported profile " + profileLevel.profile + " for " + mime); @@ -2139,9 +2198,17 @@ public final class MediaCodecInfo { maxBlocksPerSecond = Math.max(MBPS, maxBlocksPerSecond); maxBlocks = Math.max(FS, maxBlocks); maxBps = Math.max(BR * 1000, maxBps); - maxWidth = Math.max(W, maxWidth); - maxHeight = Math.max(H, maxHeight); - maxRate = Math.max(FR, maxRate); + if (strict) { + maxWidth = Math.max(W, maxWidth); + maxHeight = Math.max(H, maxHeight); + maxRate = Math.max(FR, maxRate); + } else { + // assuming max 60 fps frame rate and 1:2 aspect ratio + int maxDim = (int)Math.sqrt(FS * 2); + maxWidth = Math.max(maxDim, maxWidth); + maxHeight = Math.max(maxDim, maxHeight); + maxRate = Math.max(Math.max(FR, 60), maxRate); + } } applyMacroBlockLimits(maxWidth, maxHeight, maxBlocks, maxBlocksPerSecond, @@ -2150,34 +2217,47 @@ public final class MediaCodecInfo { mFrameRateRange = mFrameRateRange.intersect(12, maxRate); } else if (mime.equalsIgnoreCase(MediaFormat.MIMETYPE_VIDEO_H263)) { int maxWidth = 11, maxHeight = 9, maxRate = 15; + int minWidth = maxWidth, minHeight = maxHeight; + int minAlignment = 16; maxBlocks = 99; maxBlocksPerSecond = 1485; maxBps = 64000; for (CodecProfileLevel profileLevel: profileLevels) { - int MBPS = 0, BR = 0, FR = 0, W = 0, H = 0; + int MBPS = 0, BR = 0, FR = 0, W = 0, H = 0, minW = minWidth, minH = minHeight; + boolean strict = false; // true: support only sQCIF, QCIF (maybe CIF) switch (profileLevel.level) { case CodecProfileLevel.H263Level10: + strict = true; // only supports sQCIF & QCIF FR = 15; W = 11; H = 9; BR = 1; MBPS = W * H * FR; break; case CodecProfileLevel.H263Level20: - // only supports CIF, 0..QCIF - FR = 30; W = 22; H = 18; BR = 2; MBPS = W * H * FR; break; + strict = true; // only supports sQCIF, QCIF & CIF + FR = 30; W = 22; H = 18; BR = 2; MBPS = W * H * 15; break; case CodecProfileLevel.H263Level30: - // only supports CIF, 0..QCIF + strict = true; // only supports sQCIF, QCIF & CIF FR = 30; W = 22; H = 18; BR = 6; MBPS = W * H * FR; break; case CodecProfileLevel.H263Level40: - // only supports CIF, 0..QCIF + strict = true; // only supports sQCIF, QCIF & CIF FR = 30; W = 22; H = 18; BR = 32; MBPS = W * H * FR; break; case CodecProfileLevel.H263Level45: // only implies level 10 support - FR = 30; W = 11; H = 9; BR = 2; MBPS = W * H * FR; break; + strict = profileLevel.profile == CodecProfileLevel.H263ProfileBaseline + || profileLevel.profile == + CodecProfileLevel.H263ProfileBackwardCompatible; + if (!strict) { + minW = 1; minH = 1; minAlignment = 4; + } + FR = 15; W = 11; H = 9; BR = 2; MBPS = W * H * FR; break; case CodecProfileLevel.H263Level50: // only supports 50fps for H > 15 + minW = 1; minH = 1; minAlignment = 4; FR = 60; W = 22; H = 18; BR = 64; MBPS = W * H * 50; break; case CodecProfileLevel.H263Level60: // only supports 50fps for H > 15 + minW = 1; minH = 1; minAlignment = 4; FR = 60; W = 45; H = 18; BR = 128; MBPS = W * H * 50; break; case CodecProfileLevel.H263Level70: // only supports 50fps for H > 30 + minW = 1; minH = 1; minAlignment = 4; FR = 60; W = 45; H = 36; BR = 256; MBPS = W * H * 50; break; default: Log.w(TAG, "Unrecognized profile/level " + profileLevel.profile @@ -2200,6 +2280,18 @@ public final class MediaCodecInfo { + profileLevel.profile + " for " + mime); errors |= ERROR_UNRECOGNIZED; } + if (strict) { + // Strict levels define sub-QCIF min size and enumerated sizes. We cannot + // express support for "only sQCIF & QCIF (& CIF)" using VideoCapabilities + // but we can express "only QCIF (& CIF)", so set minimume size at QCIF. + // minW = 8; minH = 6; + minW = 11; minH = 9; + } else { + // any support for non-strict levels (including unrecognized profiles or + // levels) allow custom frame size support beyond supported limits + // (other than bitrate) + mAllowMbOverride = true; + } errors &= ~ERROR_NONE_SUPPORTED; maxBlocksPerSecond = Math.max(MBPS, maxBlocksPerSecond); maxBlocks = Math.max(W * H, maxBlocks); @@ -2207,11 +2299,21 @@ public final class MediaCodecInfo { maxWidth = Math.max(W, maxWidth); maxHeight = Math.max(H, maxHeight); maxRate = Math.max(FR, maxRate); + minWidth = Math.min(minW, minWidth); + minHeight = Math.min(minH, minHeight); } - applyMacroBlockLimits(maxWidth, maxHeight, + // unless we encountered custom frame size support, limit size to QCIF and CIF + // using aspect ratio. + if (!mAllowMbOverride) { + mBlockAspectRatioRange = + Range.create(new Rational(11, 9), new Rational(11, 9)); + } + applyMacroBlockLimits( + minWidth, minHeight, + maxWidth, maxHeight, maxBlocks, maxBlocksPerSecond, 16 /* blockWidth */, 16 /* blockHeight */, - 1 /* widthAlignment */, 1 /* heightAlignment */); + minAlignment /* widthAlignment */, minAlignment /* heightAlignment */); mFrameRateRange = Range.create(1, maxRate); } else if (mime.equalsIgnoreCase(MediaFormat.MIMETYPE_VIDEO_VP8)) { maxBlocks = Integer.MAX_VALUE; @@ -2299,6 +2401,8 @@ public final class MediaCodecInfo { case CodecProfileLevel.VP9Profile1: case CodecProfileLevel.VP9Profile2: case CodecProfileLevel.VP9Profile3: + case CodecProfileLevel.VP9Profile2HDR: + case CodecProfileLevel.VP9Profile3HDR: break; default: Log.w(TAG, "Unrecognized profile " @@ -2323,7 +2427,8 @@ public final class MediaCodecInfo { blockSize, blockSize, 1 /* widthAlignment */, 1 /* heightAlignment */); } else if (mime.equalsIgnoreCase(MediaFormat.MIMETYPE_VIDEO_HEVC)) { - maxBlocks = 36864; + // CTBs are at least 8x8 so use 8x8 block size + maxBlocks = 36864 >> 6; // 192x192 pixels == 576 8x8 blocks maxBlocksPerSecond = maxBlocks * 15; maxBps = 128000; for (CodecProfileLevel profileLevel: profileLevels) { @@ -2331,6 +2436,10 @@ public final class MediaCodecInfo { int FS = 0; int BR = 0; switch (profileLevel.level) { + /* The HEVC spec talks only in a very convoluted manner about the + existence of levels 1-3.1 for High tier, which could also be + understood as 'decoders and encoders should treat these levels + as if they were Main tier', so we do that. */ case CodecProfileLevel.HEVCMainTierLevel1: case CodecProfileLevel.HEVCHighTierLevel1: FR = 15; FS = 36864; BR = 128; break; @@ -2401,6 +2510,7 @@ public final class MediaCodecInfo { else DPB = 6; */ + FS >>= 6; // convert pixels to blocks errors &= ~ERROR_NONE_SUPPORTED; maxBlocksPerSecond = Math.max((int)(FR * FS), maxBlocksPerSecond); maxBlocks = Math.max(FS, maxBlocks); @@ -2408,11 +2518,6 @@ public final class MediaCodecInfo { } int maxLengthInBlocks = (int)(Math.sqrt(maxBlocks * 8)); - // CTBs are at least 8x8 - maxBlocks = Utils.divUp(maxBlocks, 8 * 8); - maxBlocksPerSecond = Utils.divUp(maxBlocksPerSecond, 8 * 8); - maxLengthInBlocks = Utils.divUp(maxLengthInBlocks, 8); - applyMacroBlockLimits( maxLengthInBlocks, maxLengthInBlocks, maxBlocks, maxBlocksPerSecond, @@ -2826,6 +2931,12 @@ public final class MediaCodecInfo { public static final int HEVCMainTierLevel62 = 0x1000000; public static final int HEVCHighTierLevel62 = 0x2000000; + private static final int HEVCHighTierLevels = + HEVCHighTierLevel1 | HEVCHighTierLevel2 | HEVCHighTierLevel21 | HEVCHighTierLevel3 | + HEVCHighTierLevel31 | HEVCHighTierLevel4 | HEVCHighTierLevel41 | HEVCHighTierLevel5 | + HEVCHighTierLevel51 | HEVCHighTierLevel52 | HEVCHighTierLevel6 | HEVCHighTierLevel61 | + HEVCHighTierLevel62; + // from OMX_VIDEO_DOLBYVISIONPROFILETYPE public static final int DolbyVisionProfileDvavPer = 0x1; public static final int DolbyVisionProfileDvavPen = 0x2; diff --git a/media/java/android/media/MediaCodecList.java b/media/java/android/media/MediaCodecList.java index cd7b3d35a590..42ce5110f134 100644 --- a/media/java/android/media/MediaCodecList.java +++ b/media/java/android/media/MediaCodecList.java @@ -63,6 +63,11 @@ final public class MediaCodecList { } /* package private */ static final Map<String, Object> getGlobalSettings() { + synchronized (sInitLock) { + if (sGlobalSettings == null) { + sGlobalSettings = native_getGlobalSettings(); + } + } return sGlobalSettings; } @@ -74,7 +79,6 @@ final public class MediaCodecList { private static final void initCodecList() { synchronized (sInitLock) { if (sRegularCodecInfos == null) { - sGlobalSettings = native_getGlobalSettings(); int count = native_getCodecCount(); ArrayList<MediaCodecInfo> regulars = new ArrayList<MediaCodecInfo>(); ArrayList<MediaCodecInfo> all = new ArrayList<MediaCodecInfo>(); diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java index cee7d60a9f36..3f6081bf183d 100644 --- a/media/java/android/media/MediaPlayer.java +++ b/media/java/android/media/MediaPlayer.java @@ -2276,6 +2276,8 @@ public class MediaPlayer extends PlayerBase Log.w(TAG, "addSubtitleSource called with null InputStream"); } + getMediaTimeProvider(); + // process each subtitle in its own thread final HandlerThread thread = new HandlerThread("SubtitleReadThread", Process.THREAD_PRIORITY_BACKGROUND + Process.THREAD_PRIORITY_MORE_FAVORABLE); @@ -2302,7 +2304,12 @@ public class MediaPlayer extends PlayerBase synchronized (mIndexTrackPairs) { mIndexTrackPairs.add(Pair.<Integer, SubtitleTrack>create(null, track)); } - track.onData(contents.getBytes(), true /* eos */, ~0 /* runID: keep forever */); + Handler h = mTimeProvider.mEventHandler; + int what = TimeProvider.NOTIFY; + int arg1 = TimeProvider.NOTIFY_TRACK_DATA; + Pair<SubtitleTrack, byte[]> trackData = Pair.create(track, contents.getBytes()); + Message m = h.obtainMessage(what, arg1, 0, trackData); + h.sendMessage(m); return MEDIA_INFO_EXTERNAL_METADATA_UPDATE; } @@ -2501,6 +2508,8 @@ public class MediaPlayer extends PlayerBase mIndexTrackPairs.add(Pair.<Integer, SubtitleTrack>create(null, track)); } + getMediaTimeProvider(); + final FileDescriptor fd3 = fd2; final long offset2 = offset; final long length2 = length; @@ -2526,7 +2535,12 @@ public class MediaPlayer extends PlayerBase total += bytes; } } - track.onData(bos.toByteArray(), true /* eos */, ~0 /* runID: keep forever */); + Handler h = mTimeProvider.mEventHandler; + int what = TimeProvider.NOTIFY; + int arg1 = TimeProvider.NOTIFY_TRACK_DATA; + Pair<SubtitleTrack, byte[]> trackData = Pair.create(track, bos.toByteArray()); + Message m = h.obtainMessage(what, arg1, 0, trackData); + h.sendMessage(m); return MEDIA_INFO_EXTERNAL_METADATA_UPDATE; } catch (Exception e) { Log.e(TAG, e.getMessage(), e); @@ -3528,6 +3542,7 @@ public class MediaPlayer extends PlayerBase private static final int REFRESH_AND_NOTIFY_TIME = 1; private static final int NOTIFY_STOP = 2; private static final int NOTIFY_SEEK = 3; + private static final int NOTIFY_TRACK_DATA = 4; private HandlerThread mHandlerThread; /** @hide */ @@ -3667,6 +3682,12 @@ public class MediaPlayer extends PlayerBase } } + private synchronized void notifyTrackData(Pair<SubtitleTrack, byte[]> trackData) { + SubtitleTrack track = trackData.first; + byte[] data = trackData.second; + track.onData(data, true /* eos */, ~0 /* runID: keep forever */); + } + private synchronized void notifyStop() { for (MediaTimeProvider.OnMediaTimeListener listener: mListeners) { if (listener == null) { @@ -3899,6 +3920,9 @@ public class MediaPlayer extends PlayerBase case NOTIFY_SEEK: notifySeek(); break; + case NOTIFY_TRACK_DATA: + notifyTrackData((Pair<SubtitleTrack, byte[]>)msg.obj); + break; } } } diff --git a/media/java/android/media/tv/TvContract.java b/media/java/android/media/tv/TvContract.java index 3a3460bbca17..20706fd19aac 100644 --- a/media/java/android/media/tv/TvContract.java +++ b/media/java/android/media/tv/TvContract.java @@ -372,76 +372,175 @@ public final class TvContract { /** The MIME type of a single TV channel. */ public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/channel"; - /** A generic channel type. */ + /** + * A generic channel type. + * + * Use this if the current channel is streaming-based or its broadcast system type does not + * fit under any other types. This is the default channel type. + * + * @see #COLUMN_TYPE + */ public static final String TYPE_OTHER = "TYPE_OTHER"; - /** The channel type for NTSC. */ + /** + * The channel type for NTSC. + * + * @see #COLUMN_TYPE + */ public static final String TYPE_NTSC = "TYPE_NTSC"; - /** The channel type for PAL. */ + /** + * The channel type for PAL. + * + * @see #COLUMN_TYPE + */ public static final String TYPE_PAL = "TYPE_PAL"; - /** The channel type for SECAM. */ + /** + * The channel type for SECAM. + * + * @see #COLUMN_TYPE + */ public static final String TYPE_SECAM = "TYPE_SECAM"; - /** The channel type for DVB-T (terrestrial). */ + /** + * The channel type for DVB-T (terrestrial). + * + * @see #COLUMN_TYPE + */ public static final String TYPE_DVB_T = "TYPE_DVB_T"; - /** The channel type for DVB-T2 (terrestrial). */ + /** + * The channel type for DVB-T2 (terrestrial). + * + * @see #COLUMN_TYPE + */ public static final String TYPE_DVB_T2 = "TYPE_DVB_T2"; - /** The channel type for DVB-S (satellite). */ + /** + * The channel type for DVB-S (satellite). + * + * @see #COLUMN_TYPE + */ public static final String TYPE_DVB_S = "TYPE_DVB_S"; - /** The channel type for DVB-S2 (satellite). */ + /** + * The channel type for DVB-S2 (satellite). + * + * @see #COLUMN_TYPE + */ public static final String TYPE_DVB_S2 = "TYPE_DVB_S2"; - /** The channel type for DVB-C (cable). */ + /** + * The channel type for DVB-C (cable). + * + * @see #COLUMN_TYPE + */ public static final String TYPE_DVB_C = "TYPE_DVB_C"; - /** The channel type for DVB-C2 (cable). */ + /** + * The channel type for DVB-C2 (cable). + * + * @see #COLUMN_TYPE + */ public static final String TYPE_DVB_C2 = "TYPE_DVB_C2"; - /** The channel type for DVB-H (handheld). */ + /** + * The channel type for DVB-H (handheld). + * + * @see #COLUMN_TYPE + */ public static final String TYPE_DVB_H = "TYPE_DVB_H"; - /** The channel type for DVB-SH (satellite). */ + /** + * The channel type for DVB-SH (satellite). + * + * @see #COLUMN_TYPE + */ public static final String TYPE_DVB_SH = "TYPE_DVB_SH"; - /** The channel type for ATSC (terrestrial). */ + /** + * The channel type for ATSC (terrestrial). + * + * @see #COLUMN_TYPE + */ public static final String TYPE_ATSC_T = "TYPE_ATSC_T"; - /** The channel type for ATSC (cable). */ + /** + * The channel type for ATSC (cable). + * + * @see #COLUMN_TYPE + */ public static final String TYPE_ATSC_C = "TYPE_ATSC_C"; - /** The channel type for ATSC-M/H (mobile/handheld). */ + /** + * The channel type for ATSC-M/H (mobile/handheld). + * + * @see #COLUMN_TYPE + */ public static final String TYPE_ATSC_M_H = "TYPE_ATSC_M_H"; - /** The channel type for ISDB-T (terrestrial). */ + /** + * The channel type for ISDB-T (terrestrial). + * + * @see #COLUMN_TYPE + */ public static final String TYPE_ISDB_T = "TYPE_ISDB_T"; - /** The channel type for ISDB-Tb (Brazil). */ + /** + * The channel type for ISDB-Tb (Brazil). + * + * @see #COLUMN_TYPE + */ public static final String TYPE_ISDB_TB = "TYPE_ISDB_TB"; - /** The channel type for ISDB-S (satellite). */ + /** + * The channel type for ISDB-S (satellite). + * + * @see #COLUMN_TYPE + */ public static final String TYPE_ISDB_S = "TYPE_ISDB_S"; - /** The channel type for ISDB-C (cable). */ + /** + * The channel type for ISDB-C (cable). + * + * @see #COLUMN_TYPE + */ public static final String TYPE_ISDB_C = "TYPE_ISDB_C"; - /** The channel type for 1seg (handheld). */ + /** + * The channel type for 1seg (handheld). + * + * @see #COLUMN_TYPE + */ public static final String TYPE_1SEG = "TYPE_1SEG"; - /** The channel type for DTMB (terrestrial). */ + /** + * The channel type for DTMB (terrestrial). + * + * @see #COLUMN_TYPE + */ public static final String TYPE_DTMB = "TYPE_DTMB"; - /** The channel type for CMMB (handheld). */ + /** + * The channel type for CMMB (handheld). + * + * @see #COLUMN_TYPE + */ public static final String TYPE_CMMB = "TYPE_CMMB"; - /** The channel type for T-DMB (terrestrial). */ + /** + * The channel type for T-DMB (terrestrial). + * + * @see #COLUMN_TYPE + */ public static final String TYPE_T_DMB = "TYPE_T_DMB"; - /** The channel type for S-DMB (satellite). */ + /** + * The channel type for S-DMB (satellite). + * + * @see #COLUMN_TYPE + */ public static final String TYPE_S_DMB = "TYPE_S_DMB"; /** A generic service type. */ @@ -540,16 +639,35 @@ public final class TvContract { public static final String COLUMN_INPUT_ID = "input_id"; /** - * The predefined type of this TV channel. - * - * <p>This is primarily used to indicate which broadcast standard (e.g. ATSC, DVB or ISDB) - * the current channel conforms to. The value should match to one of the followings: - * {@link #TYPE_OTHER}, {@link #TYPE_DVB_T}, {@link #TYPE_DVB_T2}, {@link #TYPE_DVB_S}, - * {@link #TYPE_DVB_S2}, {@link #TYPE_DVB_C}, {@link #TYPE_DVB_C2}, {@link #TYPE_DVB_H}, - * {@link #TYPE_DVB_SH}, {@link #TYPE_ATSC_T}, {@link #TYPE_ATSC_C}, - * {@link #TYPE_ATSC_M_H}, {@link #TYPE_ISDB_T}, {@link #TYPE_ISDB_TB}, - * {@link #TYPE_ISDB_S}, {@link #TYPE_ISDB_C}, {@link #TYPE_1SEG}, {@link #TYPE_DTMB}, - * {@link #TYPE_CMMB}, {@link #TYPE_T_DMB}, {@link #TYPE_S_DMB} + * The broadcast system type of this TV channel. + * + * <p>This is used to indicate the broadcast standard (e.g. ATSC, DVB or ISDB) the current + * channel conforms to. Use {@link #TYPE_OTHER} for streaming-based channels, which is the + * default channel type. The value should match to one of the followings: + * {@link #TYPE_1SEG}, + * {@link #TYPE_ATSC_C}, + * {@link #TYPE_ATSC_M_H}, + * {@link #TYPE_ATSC_T}, + * {@link #TYPE_CMMB}, + * {@link #TYPE_DTMB}, + * {@link #TYPE_DVB_C}, + * {@link #TYPE_DVB_C2}, + * {@link #TYPE_DVB_H}, + * {@link #TYPE_DVB_S}, + * {@link #TYPE_DVB_S2}, + * {@link #TYPE_DVB_SH}, + * {@link #TYPE_DVB_T}, + * {@link #TYPE_DVB_T2}, + * {@link #TYPE_ISDB_C}, + * {@link #TYPE_ISDB_S}, + * {@link #TYPE_ISDB_T}, + * {@link #TYPE_ISDB_TB}, + * {@link #TYPE_NTSC}, + * {@link #TYPE_OTHER}, + * {@link #TYPE_PAL}, + * {@link #TYPE_SECAM}, + * {@link #TYPE_S_DMB}, and + * {@link #TYPE_T_DMB}. * * <p>This is a required field. * diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/Camera2SurfaceViewTestCase.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/Camera2SurfaceViewTestCase.java index 423c3b05fc2c..a8b782e84659 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/Camera2SurfaceViewTestCase.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/Camera2SurfaceViewTestCase.java @@ -37,6 +37,7 @@ import android.hardware.camera2.CameraManager; import android.hardware.camera2.CameraMetadata; import android.hardware.camera2.CaptureRequest; import android.hardware.camera2.CaptureResult; +import android.hardware.camera2.params.StreamConfigurationMap; import android.media.ImageReader; import android.graphics.SurfaceTexture; import android.os.Bundle; @@ -127,6 +128,7 @@ public class Camera2SurfaceViewTestCase extends protected List<Size> mOrderedRAW10Sizes; // In descending order. protected List<Size> mOrderedYUV420888Sizes; // In descending order. protected HashMap<Size, Long> mMinPreviewFrameDurationMap; + protected boolean mSupportRAW10; protected WindowManager mWindowManager; @@ -603,16 +605,21 @@ public class Camera2SurfaceViewTestCase extends mCamera = CameraTestUtils.openCamera( mCameraManager, cameraId, mCameraListener, mHandler); mCollector.setCameraId(cameraId); - mStaticInfo = new StaticMetadata(mCameraManager.getCameraCharacteristics(cameraId), - CheckLevel.ASSERT, /*collector*/null); + CameraCharacteristics properties = mCameraManager.getCameraCharacteristics(cameraId); + mStaticInfo = new StaticMetadata(properties, CheckLevel.ASSERT, /*collector*/null); + StreamConfigurationMap configMap = + properties.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP); + mSupportRAW10 = configMap.isOutputSupportedFor(ImageFormat.RAW10); if (mStaticInfo.isColorOutputSupported()) { mOrderedPreviewSizes = getSupportedPreviewSizes(cameraId, mCameraManager, getPreviewSizeBound(mWindowManager, PREVIEW_SIZE_BOUND)); mOrderedVideoSizes = getSupportedVideoSizes( cameraId, mCameraManager, PREVIEW_SIZE_BOUND); mOrderedStillSizes = getSupportedStillSizes(cameraId, mCameraManager, null); - mOrderedRAW10Sizes = getSortedSizesForFormat( - cameraId, mCameraManager, ImageFormat.RAW10, null); + if (mSupportRAW10) { + mOrderedRAW10Sizes = getSortedSizesForFormat( + cameraId, mCameraManager, ImageFormat.RAW10, null); + } mOrderedYUV420888Sizes = getSortedSizesForFormat( cameraId, mCameraManager, ImageFormat.YUV_420_888, null); // Use ImageFormat.YUV_420_888 for now. TODO: need figure out what's format for preview @@ -636,6 +643,7 @@ public class Camera2SurfaceViewTestCase extends mOrderedPreviewSizes = null; mOrderedVideoSizes = null; mOrderedStillSizes = null; + mSupportRAW10 = false; } } diff --git a/packages/BackupRestoreConfirmation/res/values-nl/strings.xml b/packages/BackupRestoreConfirmation/res/values-nl/strings.xml index 81f2712e8cb3..a1d97462dec4 100644 --- a/packages/BackupRestoreConfirmation/res/values-nl/strings.xml +++ b/packages/BackupRestoreConfirmation/res/values-nl/strings.xml @@ -27,10 +27,10 @@ <string name="current_password_text" msgid="8268189555578298067">"Geef hieronder je huidige back-upwachtwoord op:"</string> <string name="device_encryption_restore_text" msgid="1570864916855208992">"Geef hieronder je wachtwoord voor apparaatcodering op."</string> <string name="device_encryption_backup_text" msgid="5866590762672844664">"Geef hieronder je wachtwoord voor apparaatversleuteling op. Dit wordt ook gebruikt om het back-uparchief te versleutelen."</string> - <string name="backup_enc_password_text" msgid="4981585714795233099">"Geef een wachtwoord op dat u wilt gebruiken voor het coderen van de gegevens van de volledige back-up. Als u dit leeg laat, wordt je huidige back-upwachtwoord gebruikt:"</string> - <string name="backup_enc_password_optional" msgid="1350137345907579306">"Als u de gegevens van de volledige back-up wilt versleutelen, geeft u daarvoor hieronder een wachtwoord op:"</string> - <string name="backup_enc_password_required" msgid="7889652203371654149">"Aangezien je apparaat is gecodeerd, moet u je back-up coderen. Geef hieronder een wachtwoord op:"</string> - <string name="restore_enc_password_text" msgid="6140898525580710823">"Als deze herstelgegevens zijn gecodeerd, geeft u hieronder het wachtwoord op:"</string> + <string name="backup_enc_password_text" msgid="4981585714795233099">"Geef een wachtwoord op dat je wilt gebruiken voor het coderen van de gegevens van de volledige back-up. Als je dit leeg laat, wordt je huidige back-upwachtwoord gebruikt:"</string> + <string name="backup_enc_password_optional" msgid="1350137345907579306">"Als je de gegevens van de volledige back-up wilt versleutelen, geef je daarvoor hieronder een wachtwoord op:"</string> + <string name="backup_enc_password_required" msgid="7889652203371654149">"Aangezien je apparaat is gecodeerd, moet je je back-up coderen. Geef hieronder een wachtwoord op:"</string> + <string name="restore_enc_password_text" msgid="6140898525580710823">"Als deze herstelgegevens zijn gecodeerd, geef je hieronder het wachtwoord op:"</string> <string name="toast_backup_started" msgid="550354281452756121">"Back-up starten..."</string> <string name="toast_backup_ended" msgid="3818080769548726424">"Back-up voltooid"</string> <string name="toast_restore_started" msgid="7881679218971277385">"Herstel starten..."</string> diff --git a/packages/BackupRestoreConfirmation/res/values-pa-rIN/strings.xml b/packages/BackupRestoreConfirmation/res/values-pa-rIN/strings.xml index 5b2100fef214..12dd5463b8e8 100644 --- a/packages/BackupRestoreConfirmation/res/values-pa-rIN/strings.xml +++ b/packages/BackupRestoreConfirmation/res/values-pa-rIN/strings.xml @@ -25,12 +25,12 @@ <string name="allow_restore_button_label" msgid="3081286752277127827">"ਮੇਰਾ ਡੈਟਾ ਰੀਸਟੋਰ ਕਰੋ"</string> <string name="deny_restore_button_label" msgid="1724367334453104378">"ਰੀਸਟੋਰ ਨਾ ਕਰੋ"</string> <string name="current_password_text" msgid="8268189555578298067">"ਕਿਰਪਾ ਕਰਕੇ ਹੇਠਾਂ ਆਪਣਾ ਮੌਜੂਦਾ ਬੈਕਅਪ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ:"</string> - <string name="device_encryption_restore_text" msgid="1570864916855208992">"ਕਿਰਪਾ ਕਰਕੇ ਹੇਠਾਂ ਆਪਣਾ ਡੀਵਾਈਸ ਐਨਕ੍ਰਿਪਸ਼ਨ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ।"</string> - <string name="device_encryption_backup_text" msgid="5866590762672844664">"ਕਿਰਪਾ ਕਰਕੇ ਹੇਠਾਂ ਆਪਣਾ ਡੀਵਾਈਸ ਐਨਕ੍ਰਿਪਸ਼ਨ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ। ਇਹ ਬੈਕਅਪ ਆਰਕਾਈਵ ਐਨਕ੍ਰਿਪਟ ਕਰਨ ਲਈ ਵੀ ਵਰਤਿਆ ਜਾਏਗਾ।"</string> - <string name="backup_enc_password_text" msgid="4981585714795233099">"ਕਿਰਪਾ ਕਰਕੇ ਪੂਰਾ ਬੈਕਅਪ ਡੈਟਾ ਐਨਕ੍ਰਿਪਟ ਕਰਨ ਦੀ ਵਰਤੋਂ ਲਈ ਇੱਕ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ। ਜੇਕਰ ਇਸਨੂੰ ਖਾਲੀ ਛੱਡਿਆ ਜਾਂਦਾ ਹੈ, ਤਾਂ ਤੁਹਾਡਾ ਵਰਤਮਾਨ ਬੈਕਅਪ ਪਾਸਵਰਡ ਵਰਤਿਆ ਜਾਏਗਾ:"</string> - <string name="backup_enc_password_optional" msgid="1350137345907579306">"ਜੇਕਰ ਤੁਸੀਂ ਪੂਰਾ ਬੈਕਅਪ ਡੈਟਾ ਐਨਕ੍ਰਿਪਟ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ, ਤਾਂ ਹੇਠਾਂ ਇੱਕ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ:"</string> - <string name="backup_enc_password_required" msgid="7889652203371654149">"ਕਿਉਂਕਿ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਐਨਕ੍ਰਿਪਟਿਡ ਬੈ, ਇਸਲਈ ਤੁਹਾਡੇ ਤੋਂ ਆਪਣਾ ਬੈਕਅਪ ਐਨਕ੍ਰਿਪਟ ਕਰਨ ਦੀ ਮੰਗ ਕੀਤੀ ਜਾਂਦੀ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਹੇਠਾਂ ਇੱਕ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ:"</string> - <string name="restore_enc_password_text" msgid="6140898525580710823">"ਜੇਕਰ ਰੀਸਟੋਰ ਡੈਟਾ ਐਨਕ੍ਰਿਪਟ ਕੀਤਾ ਗਿਆ ਹੈ, ਤਾਂ ਹੇਠਾਂ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ:"</string> + <string name="device_encryption_restore_text" msgid="1570864916855208992">"ਕਿਰਪਾ ਕਰਕੇ ਹੇਠਾਂ ਆਪਣਾ ਡੀਵਾਈਸ ਇਨਕ੍ਰਿਪਸ਼ਨ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ।"</string> + <string name="device_encryption_backup_text" msgid="5866590762672844664">"ਕਿਰਪਾ ਕਰਕੇ ਹੇਠਾਂ ਆਪਣਾ ਡੀਵਾਈਸ ਇਨਕ੍ਰਿਪਸ਼ਨ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ। ਇਹ ਬੈਕਅਪ ਆਰਕਾਈਵ ਇਨਕ੍ਰਿਪਟ ਕਰਨ ਲਈ ਵੀ ਵਰਤਿਆ ਜਾਏਗਾ।"</string> + <string name="backup_enc_password_text" msgid="4981585714795233099">"ਕਿਰਪਾ ਕਰਕੇ ਪੂਰਾ ਬੈਕਅਪ ਡੈਟਾ ਇਨਕ੍ਰਿਪਟ ਕਰਨ ਦੀ ਵਰਤੋਂ ਲਈ ਇੱਕ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ। ਜੇਕਰ ਇਸਨੂੰ ਖਾਲੀ ਛੱਡਿਆ ਜਾਂਦਾ ਹੈ, ਤਾਂ ਤੁਹਾਡਾ ਵਰਤਮਾਨ ਬੈਕਅਪ ਪਾਸਵਰਡ ਵਰਤਿਆ ਜਾਏਗਾ:"</string> + <string name="backup_enc_password_optional" msgid="1350137345907579306">"ਜੇਕਰ ਤੁਸੀਂ ਪੂਰਾ ਬੈਕਅਪ ਡੈਟਾ ਇਨਕ੍ਰਿਪਟ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ, ਤਾਂ ਹੇਠਾਂ ਇੱਕ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ:"</string> + <string name="backup_enc_password_required" msgid="7889652203371654149">"ਕਿਉਂਕਿ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਇਨਕ੍ਰਿਪਟਿਡ ਬੈ, ਇਸਲਈ ਤੁਹਾਡੇ ਤੋਂ ਆਪਣਾ ਬੈਕਅਪ ਇਨਕ੍ਰਿਪਟ ਕਰਨ ਦੀ ਮੰਗ ਕੀਤੀ ਜਾਂਦੀ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਹੇਠਾਂ ਇੱਕ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ:"</string> + <string name="restore_enc_password_text" msgid="6140898525580710823">"ਜੇਕਰ ਰੀਸਟੋਰ ਡੈਟਾ ਇਨਕ੍ਰਿਪਟ ਕੀਤਾ ਗਿਆ ਹੈ, ਤਾਂ ਹੇਠਾਂ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ:"</string> <string name="toast_backup_started" msgid="550354281452756121">"ਬੈਕਅਪ ਚਾਲੂ ਕਰ ਰਿਹਾ ਹੈ..."</string> <string name="toast_backup_ended" msgid="3818080769548726424">"ਬੈਕਅਪ ਪੂਰਾ ਹੋਇਆ"</string> <string name="toast_restore_started" msgid="7881679218971277385">"ਰੀਸਟੋਰ ਚਾਲੂ ਹੋ ਰਿਹਾ ਹੈ..."</string> diff --git a/packages/CaptivePortalLogin/res/values-bn-rBD/strings.xml b/packages/CaptivePortalLogin/res/values-bn-rBD/strings.xml index 7e8f3b5feb58..20173b0dc3bf 100644 --- a/packages/CaptivePortalLogin/res/values-bn-rBD/strings.xml +++ b/packages/CaptivePortalLogin/res/values-bn-rBD/strings.xml @@ -4,7 +4,7 @@ <string name="app_name" msgid="5934709770924185752">"CaptivePortalLogin"</string> <string name="action_use_network" msgid="6076184727448466030">"যেভাবে আছে সেভাবেই এই নেটওয়ার্ক ব্যবহার করুন"</string> <string name="action_do_not_use_network" msgid="4577366536956516683">"এই নেটওয়ার্ক ব্যবহার করবেন না"</string> - <string name="action_bar_label" msgid="917235635415966620">"নেটওয়ার্কে সাইন ইন করুন"</string> + <string name="action_bar_label" msgid="917235635415966620">"নেটওয়ার্কে প্রবেশ করুন করুন"</string> <string name="ssl_error_warning" msgid="6653188881418638872">"আপনি যে নেটওয়ার্কে যোগ দেওয়ার চেষ্টা করছেন তাতে নিরাপত্তার সমস্যা আছে।"</string> <string name="ssl_error_example" msgid="647898534624078900">"উদাহরণস্বরূপ, লগইন পৃষ্ঠাটি প্রদর্শিত প্রতিষ্ঠানের অন্তর্গত নাও হতে পারে৷"</string> <string name="ssl_error_continue" msgid="6492718244923937110">"যাই হোক না কেন ব্রাউজারের মাধ্যমে অবিরত রাখুন"</string> diff --git a/packages/DocumentsUI/res/values-be-rBY/strings.xml b/packages/DocumentsUI/res/values-be-rBY/strings.xml index a7038aa8efd0..fabcdc275a01 100644 --- a/packages/DocumentsUI/res/values-be-rBY/strings.xml +++ b/packages/DocumentsUI/res/values-be-rBY/strings.xml @@ -46,7 +46,7 @@ <string name="button_dismiss" msgid="3714065566893946085">"Адхіліць"</string> <string name="button_retry" msgid="4392027584153752797">"Паўтарыце спробу"</string> <string name="sort_name" msgid="9183560467917256779">"Па назве"</string> - <string name="sort_date" msgid="586080032956151448">"Па даце ўнясення змен"</string> + <string name="sort_date" msgid="586080032956151448">"Па даце змянення"</string> <string name="sort_size" msgid="3350681319735474741">"Па памеры"</string> <string name="drawer_open" msgid="4545466532430226949">"Паказаць каранёвыя папкі"</string> <string name="drawer_close" msgid="7602734368552123318">"Схаваць каранёвыя папкі"</string> diff --git a/packages/DocumentsUI/res/values-fr-rCA/strings.xml b/packages/DocumentsUI/res/values-fr-rCA/strings.xml index b91b148dd006..9583b8a3319b 100644 --- a/packages/DocumentsUI/res/values-fr-rCA/strings.xml +++ b/packages/DocumentsUI/res/values-fr-rCA/strings.xml @@ -117,8 +117,8 @@ <string name="allow" msgid="7225948811296386551">"Autoriser"</string> <string name="deny" msgid="2081879885755434506">"Refuser"</string> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> - <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> élément sélectionné</item> - <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> éléments sélectionnés</item> + <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> sélectionné</item> + <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> sélectionnés</item> </plurals> <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> article</item> diff --git a/packages/DocumentsUI/res/values-hy-rAM/strings.xml b/packages/DocumentsUI/res/values-hy-rAM/strings.xml index 2afb2058c8ea..fe4bcf8c3fd2 100644 --- a/packages/DocumentsUI/res/values-hy-rAM/strings.xml +++ b/packages/DocumentsUI/res/values-hy-rAM/strings.xml @@ -63,7 +63,7 @@ <string name="no_results" msgid="6622510343880730446">"%1$s-ում համընկնումներ չկան"</string> <string name="toast_no_application" msgid="4632640357724698144">"Հնարավոր չէ բացել ֆայլը"</string> <string name="toast_failed_delete" msgid="2180678019407244069">"Անհնար է ջնջել որոշ փաստաթղթեր"</string> - <string name="share_via" msgid="8966594246261344259">"Տարածել"</string> + <string name="share_via" msgid="8966594246261344259">"Կիսվել"</string> <string name="copy_notification_title" msgid="6374299806748219777">"Ֆայլերի պատճենում"</string> <string name="move_notification_title" msgid="6193835179777284805">"Ֆայլերի տեղափոխում"</string> <string name="delete_notification_title" msgid="3329403967712437496">"Ֆայլերը ջնջվում են"</string> diff --git a/packages/DocumentsUI/res/values-it/strings.xml b/packages/DocumentsUI/res/values-it/strings.xml index db705593eae3..5ad9fb291530 100644 --- a/packages/DocumentsUI/res/values-it/strings.xml +++ b/packages/DocumentsUI/res/values-it/strings.xml @@ -117,8 +117,8 @@ <string name="allow" msgid="7225948811296386551">"Consenti"</string> <string name="deny" msgid="2081879885755434506">"Nega"</string> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> - <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> elementi selezionati</item> - <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> elemento selezionato</item> + <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> file selezionati</item> + <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> file selezionato</item> </plurals> <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> elementi</item> diff --git a/packages/DocumentsUI/res/values-iw/strings.xml b/packages/DocumentsUI/res/values-iw/strings.xml index 28898608c7c5..51414e30ec65 100644 --- a/packages/DocumentsUI/res/values-iw/strings.xml +++ b/packages/DocumentsUI/res/values-iw/strings.xml @@ -32,7 +32,7 @@ <string name="menu_delete" msgid="8138799623850614177">"מחק"</string> <string name="menu_select_all" msgid="8323579667348729928">"בחר הכל"</string> <string name="menu_copy" msgid="3612326052677229148">"העתק אל…"</string> - <string name="menu_move" msgid="1828090633118079817">"העברה אל…"</string> + <string name="menu_move" msgid="1828090633118079817">"העבר אל…"</string> <string name="menu_new_window" msgid="1226032889278727538">"חלון חדש"</string> <string name="menu_copy_to_clipboard" msgid="489311381979634291">"העתק"</string> <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"הדבק"</string> diff --git a/packages/DocumentsUI/res/values-km-rKH/strings.xml b/packages/DocumentsUI/res/values-km-rKH/strings.xml index af0e07613792..7c0e8c226ac1 100644 --- a/packages/DocumentsUI/res/values-km-rKH/strings.xml +++ b/packages/DocumentsUI/res/values-km-rKH/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_label" msgid="2783841764617238354">"ឯកសារ"</string> - <string name="downloads_label" msgid="959113951084633612">"ដោនឡូត"</string> + <string name="downloads_label" msgid="959113951084633612">"ទាញយក"</string> <string name="title_open" msgid="4353228937663917801">"បើកពី"</string> <string name="title_save" msgid="2433679664882857999">"រក្សាទុកទៅ"</string> <string name="menu_create_dir" msgid="2547620241173881754">"ថតថ្មី"</string> diff --git a/packages/DocumentsUI/res/values-my-rMM/strings.xml b/packages/DocumentsUI/res/values-my-rMM/strings.xml index c288acd7e87f..fc7e05b66a4c 100644 --- a/packages/DocumentsUI/res/values-my-rMM/strings.xml +++ b/packages/DocumentsUI/res/values-my-rMM/strings.xml @@ -31,7 +31,7 @@ <string name="menu_share" msgid="3075149983979628146">"မျှဝေခြင်း"</string> <string name="menu_delete" msgid="8138799623850614177">"ဖျက်ပစ်ရန်"</string> <string name="menu_select_all" msgid="8323579667348729928">"အားလုံးကို ရွေးရန်"</string> - <string name="menu_copy" msgid="3612326052677229148">"သို့ကူးယူရန်…"</string> + <string name="menu_copy" msgid="3612326052677229148">"…သို့ကူးယူရန်"</string> <string name="menu_move" msgid="1828090633118079817">"...သို့ ရွှေ့ရန်"</string> <string name="menu_new_window" msgid="1226032889278727538">"ဝင်းဒိုးသစ်"</string> <string name="menu_copy_to_clipboard" msgid="489311381979634291">"ကူးယူရန်"</string> @@ -39,7 +39,7 @@ <string name="menu_advanced_show" msgid="4693652895715631401">"စက်ရှိစတိုရုံ ပြပါ"</string> <string name="menu_advanced_hide" msgid="4218809952721972589">"စက်ရှိစတိုရုံ ဖျောက်ထားပါ"</string> <string name="menu_file_size_show" msgid="3240323619260823076">"ဖိုင်အရွယ်အစား ပြပါ"</string> - <string name="menu_file_size_hide" msgid="8881975928502581042">"ဖိုင်အရွယ်အစား ဖျောက်ပါ"</string> + <string name="menu_file_size_hide" msgid="8881975928502581042">"ဖိုင်အရွယ်အစား ဝှက်ပါ"</string> <string name="button_select" msgid="527196987259139214">"ရွေးရန်"</string> <string name="button_copy" msgid="8706475544635021302">"ကူးယူရန်"</string> <string name="button_move" msgid="2202666023104202232">"ရွေ့မည်"</string> diff --git a/packages/DocumentsUI/res/values-pa-rIN/strings.xml b/packages/DocumentsUI/res/values-pa-rIN/strings.xml index 866539e76c4a..7e04403badd9 100644 --- a/packages/DocumentsUI/res/values-pa-rIN/strings.xml +++ b/packages/DocumentsUI/res/values-pa-rIN/strings.xml @@ -19,20 +19,20 @@ <string name="app_label" msgid="2783841764617238354">"ਦਸਤਾਵੇਜ਼"</string> <string name="downloads_label" msgid="959113951084633612">"ਡਾਊਨਲੋਡ"</string> <string name="title_open" msgid="4353228937663917801">"ਤੋਂ ਖੋਲ੍ਹੋ"</string> - <string name="title_save" msgid="2433679664882857999">"ਇਸ ਵਿੱਚ ਸੁਰੱਖਿਅਤ ਕਰੋ"</string> + <string name="title_save" msgid="2433679664882857999">"ਇਸ ਵਿੱਚ ਰੱਖਿਅਤ ਕਰੋ"</string> <string name="menu_create_dir" msgid="2547620241173881754">"ਨਵਾਂ ਫੋਲਡਰ"</string> <string name="menu_grid" msgid="6878021334497835259">"ਗ੍ਰਿਡ ਵਿਊ"</string> <string name="menu_list" msgid="7279285939892417279">"ਸੂਚੀ ਦ੍ਰਿਸ਼"</string> - <string name="menu_sort" msgid="7677740407158414452">"ਇਸ ਅਨੁਸਾਰ ਛਾਂਟੋ"</string> + <string name="menu_sort" msgid="7677740407158414452">"ਇਸ ਮੁਤਾਬਕ ਛਾਂਟੋ"</string> <string name="menu_search" msgid="3816712084502856974">"ਖੋਜੋ"</string> <string name="menu_settings" msgid="8239065133341597825">"ਸਟੋਰੇਜ ਸੈਟਿੰਗਾਂ"</string> <string name="menu_open" msgid="432922957274920903">"ਖੋਲ੍ਹੋ"</string> - <string name="menu_save" msgid="2394743337684426338">"ਸੁਰੱਖਿਅਤ ਕਰੋ"</string> - <string name="menu_share" msgid="3075149983979628146">"ਸ਼ੇਅਰ ਕਰੋ"</string> + <string name="menu_save" msgid="2394743337684426338">"ਰੱਖਿਅਤ ਕਰੋ"</string> + <string name="menu_share" msgid="3075149983979628146">"ਸਾਂਝਾ ਕਰੋ"</string> <string name="menu_delete" msgid="8138799623850614177">"ਮਿਟਾਓ"</string> <string name="menu_select_all" msgid="8323579667348729928">"ਸਭ ਚੁਣੋ"</string> <string name="menu_copy" msgid="3612326052677229148">"ਇਸ ਵਿੱਚ ਕਾਪੀ ਕਰੋ…"</string> - <string name="menu_move" msgid="1828090633118079817">"ਇਸ ਵਿੱਚ ਤਬਦੀਲ ਕਰੋ..."</string> + <string name="menu_move" msgid="1828090633118079817">"ਏਥੇ ਤਬਾਦਲਾ ਕਰੋ..."</string> <string name="menu_new_window" msgid="1226032889278727538">"ਨਵੀਂ ਵਿੰਡੋ"</string> <string name="menu_copy_to_clipboard" msgid="489311381979634291">"ਕਾਪੀ ਕਰੋ"</string> <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"ਪੇਸਟ ਕਰੋ"</string> @@ -43,7 +43,7 @@ <string name="button_select" msgid="527196987259139214">"ਚੁਣੋ"</string> <string name="button_copy" msgid="8706475544635021302">"ਕਾਪੀ ਕਰੋ"</string> <string name="button_move" msgid="2202666023104202232">"ਮੂਵ ਕਰੋ"</string> - <string name="button_dismiss" msgid="3714065566893946085">"ਬਰਖਾਸਤ ਕਰੋ"</string> + <string name="button_dismiss" msgid="3714065566893946085">"ਖਾਰਜ ਕਰੋ"</string> <string name="button_retry" msgid="4392027584153752797">"ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string> <string name="sort_name" msgid="9183560467917256779">"ਨਾਮ ਮੁਤਾਬਕ"</string> <string name="sort_date" msgid="586080032956151448">"ਸੋਧੇ ਜਾਣ ਦੀ ਤਾਰੀਖ਼ ਮੁਤਾਬਕ"</string> @@ -63,7 +63,7 @@ <string name="no_results" msgid="6622510343880730446">"%1$s ਵਿੱਚ ਕੋਈ ਮੇਲ ਨਹੀਂ"</string> <string name="toast_no_application" msgid="4632640357724698144">"ਫ਼ਾਈਲ ਨੂੰ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"</string> <string name="toast_failed_delete" msgid="2180678019407244069">"ਕੁਝ ਦਸਤਾਵੇਜ਼ ਮਿਟਾਉਣ ਵਿੱਚ ਅਸਮਰੱਥ"</string> - <string name="share_via" msgid="8966594246261344259">"ਇਸ ਰਾਹੀਂ ਸ਼ੇਅਰ ਕਰੋ"</string> + <string name="share_via" msgid="8966594246261344259">"ਇਸ ਰਾਹੀਂ ਸਾਂਝਾ ਕਰੋ"</string> <string name="copy_notification_title" msgid="6374299806748219777">"ਫਾਈਲਾਂ ਕਾਪੀ ਕਰ ਰਿਹਾ ਹੈ"</string> <string name="move_notification_title" msgid="6193835179777284805">"ਫ਼ਾਈਲਾਂ ਨੂੰ ਮੂਵ ਕਰ ਰਿਹਾ ਹੈ"</string> <string name="delete_notification_title" msgid="3329403967712437496">"ਫ਼ਾਈਲਾਂ ਨੂੰ ਮਿਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"</string> diff --git a/packages/DocumentsUI/res/values-pt-rBR/strings.xml b/packages/DocumentsUI/res/values-pt-rBR/strings.xml index 09b9d20ebab4..b86438ff05ca 100644 --- a/packages/DocumentsUI/res/values-pt-rBR/strings.xml +++ b/packages/DocumentsUI/res/values-pt-rBR/strings.xml @@ -117,7 +117,7 @@ <string name="allow" msgid="7225948811296386551">"Permitir"</string> <string name="deny" msgid="2081879885755434506">"Negar"</string> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> - <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> selecionados</item> + <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> selecionado</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> selecionados</item> </plurals> <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228"> diff --git a/packages/DocumentsUI/res/values-pt/strings.xml b/packages/DocumentsUI/res/values-pt/strings.xml index 09b9d20ebab4..b86438ff05ca 100644 --- a/packages/DocumentsUI/res/values-pt/strings.xml +++ b/packages/DocumentsUI/res/values-pt/strings.xml @@ -117,7 +117,7 @@ <string name="allow" msgid="7225948811296386551">"Permitir"</string> <string name="deny" msgid="2081879885755434506">"Negar"</string> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> - <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> selecionados</item> + <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> selecionado</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> selecionados</item> </plurals> <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228"> diff --git a/packages/DocumentsUI/res/values-sw/strings.xml b/packages/DocumentsUI/res/values-sw/strings.xml index 46a02778ed17..eb37ad0d0624 100644 --- a/packages/DocumentsUI/res/values-sw/strings.xml +++ b/packages/DocumentsUI/res/values-sw/strings.xml @@ -117,8 +117,8 @@ <string name="allow" msgid="7225948811296386551">"Ruhusu"</string> <string name="deny" msgid="2081879885755434506">"Kataza"</string> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> - <item quantity="other">Imechagua <xliff:g id="COUNT_1">%1$d</xliff:g></item> - <item quantity="one">Imechagua <xliff:g id="COUNT_0">%1$d</xliff:g></item> + <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> zimechaguliwa</item> + <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> imechaguliwa</item> </plurals> <plurals name="elements_dragged" formatted="false" msgid="3727204615215602228"> <item quantity="other">Vipengee <xliff:g id="COUNT_1">%1$d</xliff:g></item> diff --git a/packages/DocumentsUI/res/values-uz-rUZ/strings.xml b/packages/DocumentsUI/res/values-uz-rUZ/strings.xml index 68614bf63c54..a3e117aa34fb 100644 --- a/packages/DocumentsUI/res/values-uz-rUZ/strings.xml +++ b/packages/DocumentsUI/res/values-uz-rUZ/strings.xml @@ -28,7 +28,7 @@ <string name="menu_settings" msgid="8239065133341597825">"Xotira sozlamalari"</string> <string name="menu_open" msgid="432922957274920903">"Ochish"</string> <string name="menu_save" msgid="2394743337684426338">"Saqlash"</string> - <string name="menu_share" msgid="3075149983979628146">"Ulashish"</string> + <string name="menu_share" msgid="3075149983979628146">"Baham ko‘rish"</string> <string name="menu_delete" msgid="8138799623850614177">"O‘chirish"</string> <string name="menu_select_all" msgid="8323579667348729928">"Hammasini belgilash"</string> <string name="menu_copy" msgid="3612326052677229148">"Nusxalash…"</string> @@ -38,7 +38,7 @@ <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Joylash"</string> <string name="menu_advanced_show" msgid="4693652895715631401">"Ichki xotirani ko‘rsatish"</string> <string name="menu_advanced_hide" msgid="4218809952721972589">"Ichki xotirani berkitish"</string> - <string name="menu_file_size_show" msgid="3240323619260823076">"Fayllar hajmini ko‘rsatish"</string> + <string name="menu_file_size_show" msgid="3240323619260823076">"Fayllar hajmi ko‘rsatilsin"</string> <string name="menu_file_size_hide" msgid="8881975928502581042">"Fayllar hajmi ko‘rsatilmasin"</string> <string name="button_select" msgid="527196987259139214">"Tanlash"</string> <string name="button_copy" msgid="8706475544635021302">"Nusxalash"</string> diff --git a/packages/DocumentsUI/res/values-vi/strings.xml b/packages/DocumentsUI/res/values-vi/strings.xml index 6f19037e64a9..3979535a8c42 100644 --- a/packages/DocumentsUI/res/values-vi/strings.xml +++ b/packages/DocumentsUI/res/values-vi/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_label" msgid="2783841764617238354">"Tài liệu"</string> - <string name="downloads_label" msgid="959113951084633612">"Tài nguyên đã tải xuống"</string> + <string name="downloads_label" msgid="959113951084633612">"Tải xuống"</string> <string name="title_open" msgid="4353228937663917801">"Mở từ"</string> <string name="title_save" msgid="2433679664882857999">"Lưu vào"</string> <string name="menu_create_dir" msgid="2547620241173881754">"Thư mục mới"</string> diff --git a/packages/DocumentsUI/res/values-zh-rCN/strings.xml b/packages/DocumentsUI/res/values-zh-rCN/strings.xml index 2dd2ae3333f5..d11362bc7e02 100644 --- a/packages/DocumentsUI/res/values-zh-rCN/strings.xml +++ b/packages/DocumentsUI/res/values-zh-rCN/strings.xml @@ -124,7 +124,7 @@ <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> 项</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> 项</item> </plurals> - <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"要删除“<xliff:g id="NAME">%1$s</xliff:g>”吗？"</string> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"确定要删除“<xliff:g id="NAME">%1$s</xliff:g>”吗？"</string> <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"要删除文件夹“<xliff:g id="NAME">%1$s</xliff:g>”及其中的内容吗？"</string> <plurals name="delete_files_confirmation_message" formatted="false" msgid="8417505791395471802"> <item quantity="other">删除 <xliff:g id="COUNT_1">%1$d</xliff:g> 个文件？</item> diff --git a/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java b/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java index 57c14e98727c..b82f8dd3d7a3 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java @@ -86,17 +86,26 @@ public class FilesActivity extends BaseActivity { if (mState.restored) { if (DEBUG) Log.d(TAG, "Stack already resolved for uri: " + intent.getData()); } else if (!mState.stack.isEmpty()) { - // If a non-empty stack is present in our state it was read (presumably) + // If a non-empty stack is present in our state, it was read (presumably) // from EXTRA_STACK intent extra. In this case, we'll skip other means of - // loading or restoring the stack. + // loading or restoring the stack (like URI). // - // When restoring from a stack, if a URI is present, it should only ever - // be a launch URI, or a fake Uri from notifications. - // Launch URIs support sensible activity management, but don't specify a real - // content target. - if (DEBUG) Log.d(TAG, "Launching with non-empty stack."); - assert(uri == null || uri.getAuthority() == null || - LauncherActivity.isLaunchUri(uri)); + // When restoring from a stack, if a URI is present, it should only ever be: + // -- a launch URI: Launch URIs support sensible activity management, + // but don't specify a real content target) + // -- a fake Uri from notifications. These URIs have no authority (TODO: details). + // + // Any other URI is *sorta* unexpected...except when browsing an archive + // in downloads. + if(uri != null + && uri.getAuthority() != null + && !uri.equals(mState.stack.peek()) + && !LauncherActivity.isLaunchUri(uri)) { + if (DEBUG) Log.w(TAG, + "Launching with non-empty stack. Ignoring unexpected uri: " + uri); + } else { + if (DEBUG) Log.d(TAG, "Launching with non-empty stack."); + } refreshCurrentRootAndDirectory(AnimationView.ANIM_NONE); } else if (Intent.ACTION_VIEW.equals(intent.getAction())) { assert(uri != null); diff --git a/packages/DocumentsUI/src/com/android/documentsui/services/Job.java b/packages/DocumentsUI/src/com/android/documentsui/services/Job.java index b4f1299f6d8a..b8f8fba72d62 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/services/Job.java +++ b/packages/DocumentsUI/src/com/android/documentsui/services/Job.java @@ -308,7 +308,9 @@ abstract public class Job implements Runnable { String id, DocumentStack stack, List<DocumentInfo> srcs, DocumentInfo srcParent) { assert(!srcs.isEmpty()); - assert(stack.peek().isDirectory()); // we can't currently delete from archives. + // stack is empty if we delete docs from recent. + // we can't currently delete from archives. + assert(stack.isEmpty() || stack.peek().isDirectory()); return new DeleteJob(service, appContext, listener, id, stack, srcs, srcParent); } } diff --git a/packages/InputDevices/res/values-be-rBY/strings.xml b/packages/InputDevices/res/values-be-rBY/strings.xml index 7d7683c8ec81..a552fa57419d 100644 --- a/packages/InputDevices/res/values-be-rBY/strings.xml +++ b/packages/InputDevices/res/values-be-rBY/strings.xml @@ -3,8 +3,8 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="8016145283189546017">"Input Devices"</string> <string name="keyboard_layouts_label" msgid="6688773268302087545">"Клавіятура Android"</string> - <string name="keyboard_layout_english_uk_label" msgid="6664258463319999632">"Англійская (Злучанае Каралеўства)"</string> - <string name="keyboard_layout_english_us_label" msgid="8994890249649106291">"Англійская (ЗША)"</string> + <string name="keyboard_layout_english_uk_label" msgid="6664258463319999632">"англійская (Вялікабрытанія)"</string> + <string name="keyboard_layout_english_us_label" msgid="8994890249649106291">"англійская (ЗША)"</string> <string name="keyboard_layout_english_us_intl" msgid="3705168594034233583">"Англійская (ЗША), міжнар. раскладка"</string> <string name="keyboard_layout_english_us_colemak_label" msgid="4194969610343455380">"Англійская (ЗША), раскладка Colemak"</string> <string name="keyboard_layout_english_us_dvorak_label" msgid="793528923171145202">"Англійская (ЗША), раскладка Дворака"</string> diff --git a/packages/InputDevices/res/values-kn-rIN/strings.xml b/packages/InputDevices/res/values-kn-rIN/strings.xml index 243e65977757..966818dbc885 100644 --- a/packages/InputDevices/res/values-kn-rIN/strings.xml +++ b/packages/InputDevices/res/values-kn-rIN/strings.xml @@ -3,7 +3,7 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="8016145283189546017">"ಇನ್ಪುಟ್ ಸಾಧನಗಳು"</string> <string name="keyboard_layouts_label" msgid="6688773268302087545">"Android ಕೀಬೋರ್ಡ್"</string> - <string name="keyboard_layout_english_uk_label" msgid="6664258463319999632">"ಇಂಗ್ಲಿಷ್ (UK)"</string> + <string name="keyboard_layout_english_uk_label" msgid="6664258463319999632">"ಇಂಗ್ಲಿಷ್ (ಯುಕೆ)"</string> <string name="keyboard_layout_english_us_label" msgid="8994890249649106291">"ಇಂಗ್ಲಿಷ್ (US)"</string> <string name="keyboard_layout_english_us_intl" msgid="3705168594034233583">"ಇಂಗ್ಲಿಷ್ (US), ಅಂತರರಾಷ್ಟ್ರೀಯ ಶೈಲಿ"</string> <string name="keyboard_layout_english_us_colemak_label" msgid="4194969610343455380">"ಇಂಗ್ಲಿಷ್ (US), ಕೋಲ್ಮಾರ್ಕ್ ಶೈಲಿ"</string> diff --git a/packages/InputDevices/res/values-sw/strings.xml b/packages/InputDevices/res/values-sw/strings.xml index 1f447b0cc740..90516850443a 100644 --- a/packages/InputDevices/res/values-sw/strings.xml +++ b/packages/InputDevices/res/values-sw/strings.xml @@ -11,7 +11,7 @@ <string name="keyboard_layout_english_us_workman_label" msgid="2944541595262173111">"Kiingereza (US), mtindo wa Workman"</string> <string name="keyboard_layout_german_label" msgid="8451565865467909999">"Kijerumani"</string> <string name="keyboard_layout_french_label" msgid="813450119589383723">"Kifaransa"</string> - <string name="keyboard_layout_french_ca_label" msgid="365352601060604832">"Kifaransa (Kanada)"</string> + <string name="keyboard_layout_french_ca_label" msgid="365352601060604832">"Kifaransa (Canada)"</string> <string name="keyboard_layout_russian_label" msgid="8724879775815042968">"Kirusi"</string> <string name="keyboard_layout_russian_mac_label" msgid="3795866869038264796">"Kirusi, Muundo wa Mac"</string> <string name="keyboard_layout_spanish_label" msgid="7091555148131908240">"Kihispania"</string> diff --git a/packages/Keyguard/res/values-fa/strings.xml b/packages/Keyguard/res/values-fa/strings.xml index 6240cefe16b1..39fd4608de51 100644 --- a/packages/Keyguard/res/values-fa/strings.xml +++ b/packages/Keyguard/res/values-fa/strings.xml @@ -92,8 +92,8 @@ <string name="kg_failed_attempts_almost_at_erase_profile" product="default" msgid="6853071165802933545">"<xliff:g id="NUMBER_0">%1$d</xliff:g> تلاش ناموفق برای باز کردن قفل تلفن داشتهاید. پس از <xliff:g id="NUMBER_1">%2$d</xliff:g> تلاش ناموفق دیگر، نمایه کار حذف میشود که با آن کل اطلاعات نمایه حذف میشود."</string> <string name="kg_failed_attempts_now_erasing_profile" product="tablet" msgid="4686386497449912146">"<xliff:g id="NUMBER">%d</xliff:g> تلاش ناموفق برای باز کردن قفل رایانه لوحی داشتهاید. نمایه کار حذف میشود که با آن همه اطلاعات نمایه حذف میشود."</string> <string name="kg_failed_attempts_now_erasing_profile" product="default" msgid="4951507352869831265">"<xliff:g id="NUMBER">%d</xliff:g> تلاش ناموفق برای باز کردن قفل تلفن داشتهاید. نمایه کار حذف میشود که با آن همه اطلاعات نمایه حذف میشود."</string> - <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"شما الگوی بازگشایی قفل خود را <xliff:g id="NUMBER_0">%1$d</xliff:g> بار اشتباه کشیدهاید. بعد از <xliff:g id="NUMBER_1">%2$d</xliff:g> تلاش ناموفق، از شما خواسته میشود که با استفاده از یک حساب ایمیل قفل رایانه لوحی خود را باز کنید.\n\n لطفاً پس از <xliff:g id="NUMBER_2">%3$d</xliff:g> ثانیه دوباره امتحان کنید."</string> - <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"شما الگوی بازگشایی قفل خود را <xliff:g id="NUMBER_0">%1$d</xliff:g> بار اشتباه کشیدهاید. پس از <xliff:g id="NUMBER_1">%2$d</xliff:g> تلاش ناموفق، از شما خواسته میشود که با استفاده از یک حساب ایمیل قفل تلفن خود را باز کنید.\n\n لطفاً پس از <xliff:g id="NUMBER_2">%3$d</xliff:g> ثانیه دوباره امتحان کنید."</string> + <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"شما الگوی بازگشایی قفل خود را <xliff:g id="NUMBER_0">%1$d</xliff:g> بار اشتباه کشیدهاید. بعد از <xliff:g id="NUMBER_1">%2$d</xliff:g> تلاش ناموفق، از شما خواسته میشود که با استفاده از یک حساب رایانامه قفل رایانه لوحی خود را باز کنید.\n\n لطفاً پس از <xliff:g id="NUMBER_2">%3$d</xliff:g> ثانیه دوباره امتحان کنید."</string> + <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"شما الگوی بازگشایی قفل خود را <xliff:g id="NUMBER_0">%1$d</xliff:g> بار اشتباه کشیدهاید. پس از <xliff:g id="NUMBER_1">%2$d</xliff:g> تلاش ناموفق، از شما خواسته میشود که با استفاده از یک حساب رایانامه قفل تلفن خود را باز کنید.\n\n لطفاً پس از <xliff:g id="NUMBER_2">%3$d</xliff:g> ثانیه دوباره امتحان کنید."</string> <string name="kg_password_wrong_pin_code_pukked" msgid="30531039455764924">"کد پین سیم کارت اشتباه است، اکنون برای گشودن قفل دستگاهتان باید با شرکت مخابراتی تماس بگیرید."</string> <plurals name="kg_password_wrong_pin_code" formatted="false" msgid="6721575017538162249"> <item quantity="one">کد پین سیمکارت اشتباه است، <xliff:g id="NUMBER_1">%d</xliff:g> بار دیگر میتوانید تلاش کنید.</item> diff --git a/packages/Keyguard/res/values-ja/strings.xml b/packages/Keyguard/res/values-ja/strings.xml index 28a6c9fe345c..d30355fedce8 100644 --- a/packages/Keyguard/res/values-ja/strings.xml +++ b/packages/Keyguard/res/values-ja/strings.xml @@ -93,7 +93,7 @@ <string name="kg_failed_attempts_now_erasing_profile" product="tablet" msgid="4686386497449912146">"タブレットのロック解除に<xliff:g id="NUMBER">%d</xliff:g>回失敗しました。仕事用プロファイルが削除され、プロファイルのデータがすべて削除されます。"</string> <string name="kg_failed_attempts_now_erasing_profile" product="default" msgid="4951507352869831265">"スマートフォンのロック解除に<xliff:g id="NUMBER">%d</xliff:g>回失敗しました。仕事用プロファイルが削除され、プロファイルのデータがすべて削除されます。"</string> <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"ロック解除パターンの入力を<xliff:g id="NUMBER_0">%1$d</xliff:g>回間違えました。あと<xliff:g id="NUMBER_1">%2$d</xliff:g>回間違えると、タブレットのロック解除にメールアカウントが必要になります。\n\n<xliff:g id="NUMBER_2">%3$d</xliff:g>秒後にもう一度お試しください。"</string> - <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"ロック解除パターンの入力を<xliff:g id="NUMBER_0">%1$d</xliff:g>回間違えました。あと<xliff:g id="NUMBER_1">%2$d</xliff:g>回間違えると、携帯端末のロック解除にメールアカウントが必要になります。\n\n<xliff:g id="NUMBER_2">%3$d</xliff:g>秒後にもう一度お試しください。"</string> + <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"ロック解除パターンの入力を<xliff:g id="NUMBER_0">%1$d</xliff:g>回間違えました。あと<xliff:g id="NUMBER_1">%2$d</xliff:g>回間違えると、モバイル端末のロック解除にメールアカウントが必要になります。\n\n<xliff:g id="NUMBER_2">%3$d</xliff:g>秒後にもう一度お試しください。"</string> <string name="kg_password_wrong_pin_code_pukked" msgid="30531039455764924">"SIM PINコードが無効です。お使いの端末をロック解除するには携帯通信会社にお問い合わせいただく必要があります。"</string> <plurals name="kg_password_wrong_pin_code" formatted="false" msgid="6721575017538162249"> <item quantity="other">SIM PINコードが無効です。入力できるのはあと<xliff:g id="NUMBER_1">%d</xliff:g>回です。</item> @@ -110,9 +110,9 @@ <string name="keyguard_carrier_default" msgid="8700650403054042153">"通信サービスはありません。"</string> <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"入力方法の切り替え"</string> <string name="airplane_mode" msgid="3122107900897202805">"機内モード"</string> - <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"端末の再起動後にパターンの入力が必要となります"</string> - <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"端末の再起動後に PIN の入力が必要となります"</string> - <string name="kg_prompt_reason_restart_password" msgid="6504585392626524695">"端末の再起動後にパスワードの入力が必要となります"</string> + <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"端末の再起動後はパターンの入力が必要となります"</string> + <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"端末の再起動後は PIN の入力が必要となります"</string> + <string name="kg_prompt_reason_restart_password" msgid="6504585392626524695">"端末の再起動後はパスワードの入力が必要となります"</string> <string name="kg_prompt_reason_timeout_pattern" msgid="3717506169674397620">"セキュリティを強化するにはパターンが必要です"</string> <string name="kg_prompt_reason_timeout_pin" msgid="6951483704195396341">"セキュリティを強化するには PIN が必要です"</string> <string name="kg_prompt_reason_timeout_password" msgid="7306667546971345027">"セキュリティを強化するにはパスワードが必要です"</string> diff --git a/packages/Keyguard/res/values-kk-rKZ/strings.xml b/packages/Keyguard/res/values-kk-rKZ/strings.xml index accef7a04c03..be261fb332ab 100644 --- a/packages/Keyguard/res/values-kk-rKZ/strings.xml +++ b/packages/Keyguard/res/values-kk-rKZ/strings.xml @@ -48,7 +48,7 @@ <string name="keyguard_sim_unlock_progress_dialog_message" msgid="7975221805033614426">"SIM картасының бекітпесін ашуда…"</string> <string name="keyguard_accessibility_pattern_unlock" msgid="1490840706075246612">"Кескін арқылы ашу."</string> <string name="keyguard_accessibility_pin_unlock" msgid="2469687111784035046">"Pin арқылы ашу."</string> - <string name="keyguard_accessibility_password_unlock" msgid="7675777623912155089">"Кілтсөз арқылы ашу."</string> + <string name="keyguard_accessibility_password_unlock" msgid="7675777623912155089">"Құпия сөз арқылы ашу."</string> <string name="keyguard_accessibility_pattern_area" msgid="7679891324509597904">"Кескін арқылы ашу аймағы."</string> <string name="keyguard_accessibility_slide_area" msgid="6736064494019979544">"Сырғыту аймағы."</string> <string name="keyguard_accessibility_pin_area" msgid="7903959476607833485">"PIN аумағы"</string> diff --git a/packages/Keyguard/res/values-kn-rIN/strings.xml b/packages/Keyguard/res/values-kn-rIN/strings.xml index 3e937fa0ad72..5691a6354b22 100644 --- a/packages/Keyguard/res/values-kn-rIN/strings.xml +++ b/packages/Keyguard/res/values-kn-rIN/strings.xml @@ -54,12 +54,12 @@ <string name="keyguard_accessibility_pin_area" msgid="7903959476607833485">"ಪಿನ್ ಪ್ರದೇಶ"</string> <string name="keyguard_accessibility_sim_pin_area" msgid="3887780775111719336">"ಸಿಮ್ ಪಿನ್ ಪ್ರದೇಶ"</string> <string name="keyguard_accessibility_sim_puk_area" msgid="1880823406954996207">"ಸಿಮ್ PUK ಪ್ರದೇಶ"</string> - <string name="keyguard_accessibility_next_alarm" msgid="7269583073750518672">"<xliff:g id="ALARM">%1$s</xliff:g> ಗೆ ಮುಂದಿನ ಅಲಾರಂ ಹೊಂದಿಸಲಾಗಿದೆ"</string> + <string name="keyguard_accessibility_next_alarm" msgid="7269583073750518672">"<xliff:g id="ALARM">%1$s</xliff:g> ಗೆ ಮುಂದಿನ ಅಲಾರಮ್ ಹೊಂದಿಸಲಾಗಿದೆ"</string> <string name="keyboardview_keycode_delete" msgid="3337914833206635744">"ಅಳಿಸು"</string> <string name="keyboardview_keycode_enter" msgid="2985864015076059467">"ನಮೂದಿಸು"</string> <string name="kg_forgot_pattern_button_text" msgid="8852021467868220608">"ಪ್ಯಾಟರ್ನ್ ಅನ್ನು ಮರೆತಿರುವಿರಿ"</string> <string name="kg_wrong_pattern" msgid="1850806070801358830">"ತಪ್ಪು ಪ್ಯಾಟರ್ನ್"</string> - <string name="kg_wrong_password" msgid="2333281762128113157">"ತಪ್ಪಾದ ಪಾಸ್ವರ್ಡ್"</string> + <string name="kg_wrong_password" msgid="2333281762128113157">"ತಪ್ಪು ಪಾಸ್ವರ್ಡ್"</string> <string name="kg_wrong_pin" msgid="1131306510833563801">"ತಪ್ಪಾದ ಪಿನ್"</string> <string name="kg_too_many_failed_attempts_countdown" msgid="6358110221603297548">"<xliff:g id="NUMBER">%d</xliff:g> ಸೆಕೆಂಡುಗಳಲ್ಲಿ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string> <string name="kg_pattern_instructions" msgid="398978611683075868">"ನಿಮ್ಮ ನಮೂನೆಯನ್ನು ಚಿತ್ರಿಸಿ"</string> diff --git a/packages/Keyguard/res/values-ml-rIN/strings.xml b/packages/Keyguard/res/values-ml-rIN/strings.xml index 2e281572375c..fa39ae11af9b 100644 --- a/packages/Keyguard/res/values-ml-rIN/strings.xml +++ b/packages/Keyguard/res/values-ml-rIN/strings.xml @@ -29,7 +29,7 @@ <string name="keyguard_password_enter_password_code" msgid="1054721668279049780">"അൺലോക്കുചെയ്യുന്നതിന് പാസ്വേഡ് ടൈപ്പുചെയ്യുക"</string> <string name="keyguard_password_enter_pin_password_code" msgid="6391755146112503443">"അൺലോക്കുചെയ്യുന്നതിന് പിൻ ടൈപ്പുചെയ്യുക"</string> <string name="keyguard_password_wrong_pin_code" msgid="2422225591006134936">"പിൻ കോഡ് തെറ്റാണ്."</string> - <string name="keyguard_charged" msgid="3272223906073492454">"ചാർജ്ജുചെയ്തു"</string> + <string name="keyguard_charged" msgid="3272223906073492454">"ചാർജായി"</string> <string name="keyguard_plugged_in" msgid="9087497435553252863">"ചാർജ്ജുചെയ്യുന്നു"</string> <string name="keyguard_plugged_in_charging_fast" msgid="6671162730167305479">"വേഗത്തിൽ ചാർജുചെയ്യുന്നു"</string> <string name="keyguard_plugged_in_charging_slowly" msgid="1964714661071163229">"പതുക്കെ ചാർജുചെയ്യുന്നു"</string> diff --git a/packages/Keyguard/res/values-mn-rMN/strings.xml b/packages/Keyguard/res/values-mn-rMN/strings.xml index c43611669b4b..d9014c89e183 100644 --- a/packages/Keyguard/res/values-mn-rMN/strings.xml +++ b/packages/Keyguard/res/values-mn-rMN/strings.xml @@ -92,7 +92,7 @@ <string name="kg_failed_attempts_almost_at_erase_profile" product="default" msgid="6853071165802933545">"Та утасны түгжээг тайлах оролдлогыг <xliff:g id="NUMBER_0">%1$d</xliff:g> удаа буруу хийсэн байна. <xliff:g id="NUMBER_1">%2$d</xliff:g>-с илүү удаа буруу хийвэл ажлын профайл устгагдах бөгөөд энэ нь улмаар профайлын бүх мэдээллийг устгах болно."</string> <string name="kg_failed_attempts_now_erasing_profile" product="tablet" msgid="4686386497449912146">"Та таблетын түгжээг тайлах оролдлогыг <xliff:g id="NUMBER">%d</xliff:g> удаа буруу оруулсан байна. Ажлын профайл устгагдаж, улмаар профайлын бүх мэдээлэл устах болно."</string> <string name="kg_failed_attempts_now_erasing_profile" product="default" msgid="4951507352869831265">"Та утасны түгжээг тайлах оролдлогыг <xliff:g id="NUMBER">%d</xliff:g> удаа буруу оруулсан байна. Ажлын профайл устгагдаж, улмаар профайлын бүх мэдээлэл устах болно."</string> - <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Та тайлах хээг <xliff:g id="NUMBER_0">%1$d</xliff:g> удаа буруу зурлаа. <xliff:g id="NUMBER_1">%2$d</xliff:g> удаа дахин буруу оруулбал, та таблетаа тайлахын тулд имэйл акаунт шаардлагатай болно.\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> секундын дараа дахин оролдоно уу."</string> + <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Та тайлах хээг <xliff:g id="NUMBER_0">%1$d</xliff:g> удаа буруу зурлаа. <xliff:g id="NUMBER_1">%2$d</xliff:g> удаа дахин буруу оруулбал, та таблетаа тайлахын тулд имэйл бүртгэл шаардлагатай болно.\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> секундын дараа дахин оролдоно уу."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Та тайлах хээг <xliff:g id="NUMBER_0">%1$d</xliff:g> удаа буруу зурлаа. <xliff:g id="NUMBER_1">%2$d</xliff:g> удаа дахин буруу оруулбал, та утсаа тайлахын тулд имэйл акаунтаа ашиглах шаардлагатай болно.\n\n <xliff:g id="NUMBER_2">%3$d</xliff:g> секундын дараа дахин оролдоно уу."</string> <string name="kg_password_wrong_pin_code_pukked" msgid="30531039455764924">"СИМ ПИН код буруу, та төхөөрөмжийн түгжээг тайлахын тулд оператор компанитай холбоо барих шаардлагатай."</string> <plurals name="kg_password_wrong_pin_code" formatted="false" msgid="6721575017538162249"> diff --git a/packages/Keyguard/res/values-my-rMM/strings.xml b/packages/Keyguard/res/values-my-rMM/strings.xml index 017a6b8b7308..5db7e95a76bf 100644 --- a/packages/Keyguard/res/values-my-rMM/strings.xml +++ b/packages/Keyguard/res/values-my-rMM/strings.xml @@ -29,7 +29,7 @@ <string name="keyguard_password_enter_password_code" msgid="1054721668279049780">"သော့ဖွင့်ရန် စကားဝှက်ကို ရိုက်ထည့်ပါ"</string> <string name="keyguard_password_enter_pin_password_code" msgid="6391755146112503443">"သော့ဖွင့်ရန် PIN ကို ရိုက်ထည့်ပါ"</string> <string name="keyguard_password_wrong_pin_code" msgid="2422225591006134936">"ပင်နံပါတ်မှားနေပါသည်"</string> - <string name="keyguard_charged" msgid="3272223906073492454">"အားသွင်းနေပါသည်"</string> + <string name="keyguard_charged" msgid="3272223906073492454">"အားသွင်းပြီးပါပြီ"</string> <string name="keyguard_plugged_in" msgid="9087497435553252863">"အားသွင်းနေ"</string> <string name="keyguard_plugged_in_charging_fast" msgid="6671162730167305479">"လျှင်မြန်စွာ အားသွင်းနေသည်"</string> <string name="keyguard_plugged_in_charging_slowly" msgid="1964714661071163229">"နှေးကွေးစွာ အားသွင်းနေသည်"</string> diff --git a/packages/Keyguard/res/values-pa-rIN/strings.xml b/packages/Keyguard/res/values-pa-rIN/strings.xml index 8b176592dd36..5f0b6d8feefe 100644 --- a/packages/Keyguard/res/values-pa-rIN/strings.xml +++ b/packages/Keyguard/res/values-pa-rIN/strings.xml @@ -29,7 +29,7 @@ <string name="keyguard_password_enter_password_code" msgid="1054721668279049780">"ਅਨਲੌਕ ਕਰਨ ਲਈ ਪਾਸਵਰਡ ਟਾਈਪ ਕਰੋ"</string> <string name="keyguard_password_enter_pin_password_code" msgid="6391755146112503443">"ਅਨਲੌਕ ਕਰਨ ਲਈ PIN ਟਾਈਪ ਕਰੋ"</string> <string name="keyguard_password_wrong_pin_code" msgid="2422225591006134936">"ਗ਼ਲਤ PIN ਕੋਡ।"</string> - <string name="keyguard_charged" msgid="3272223906073492454">"ਚਾਰਜ ਕੀਤਾ"</string> + <string name="keyguard_charged" msgid="3272223906073492454">"ਚਾਰਜ ਹੋਇਆ"</string> <string name="keyguard_plugged_in" msgid="9087497435553252863">"ਚਾਰਜਿੰਗ"</string> <string name="keyguard_plugged_in_charging_fast" msgid="6671162730167305479">"ਤੇਜ਼ੀ ਨਾਲ ਚਾਰਜ ਹੋ ਰਿਹਾ ਹੈ"</string> <string name="keyguard_plugged_in_charging_slowly" msgid="1964714661071163229">"ਹੌਲੀ-ਹੌਲੀ ਚਾਰਜ ਹੋ ਰਿਹਾ ਹੈ"</string> diff --git a/packages/Keyguard/res/values-ro/strings.xml b/packages/Keyguard/res/values-ro/strings.xml index dbbef714ac6b..ea5380cbde25 100644 --- a/packages/Keyguard/res/values-ro/strings.xml +++ b/packages/Keyguard/res/values-ro/strings.xml @@ -32,11 +32,11 @@ <string name="keyguard_charged" msgid="3272223906073492454">"Încărcată"</string> <string name="keyguard_plugged_in" msgid="9087497435553252863">"Se încarcă"</string> <string name="keyguard_plugged_in_charging_fast" msgid="6671162730167305479">"Încărcare rapidă"</string> - <string name="keyguard_plugged_in_charging_slowly" msgid="1964714661071163229">"Încărcare lentă"</string> + <string name="keyguard_plugged_in_charging_slowly" msgid="1964714661071163229">"Se încarcă lent"</string> <string name="keyguard_low_battery" msgid="8143808018719173859">"Conectați încărcătorul."</string> <string name="keyguard_instructions_when_pattern_disabled" msgid="1332288268600329841">"Apăsați pe Meniu pentru a debloca."</string> <string name="keyguard_network_locked_message" msgid="9169717779058037168">"Rețea blocată"</string> - <string name="keyguard_missing_sim_message_short" msgid="494980561304211931">"Fără SIM."</string> + <string name="keyguard_missing_sim_message_short" msgid="494980561304211931">"Fără SIM"</string> <string name="keyguard_missing_sim_message" product="tablet" msgid="1445849005909260039">"Tableta nu are card SIM."</string> <string name="keyguard_missing_sim_message" product="default" msgid="3481110395508637643">"Telefonul nu are card SIM."</string> <string name="keyguard_missing_sim_instructions" msgid="5210891509995942250">"Introduceți un card SIM."</string> diff --git a/packages/Keyguard/res/values-th/strings.xml b/packages/Keyguard/res/values-th/strings.xml index 415836fd1371..1799fe8ddec5 100644 --- a/packages/Keyguard/res/values-th/strings.xml +++ b/packages/Keyguard/res/values-th/strings.xml @@ -32,7 +32,7 @@ <string name="keyguard_charged" msgid="3272223906073492454">"ชาร์จแล้ว"</string> <string name="keyguard_plugged_in" msgid="9087497435553252863">"กำลังชาร์จ"</string> <string name="keyguard_plugged_in_charging_fast" msgid="6671162730167305479">"กำลังชาร์จเร็ว"</string> - <string name="keyguard_plugged_in_charging_slowly" msgid="1964714661071163229">"กำลังชาร์จช้า"</string> + <string name="keyguard_plugged_in_charging_slowly" msgid="1964714661071163229">"กำลังชาร์จอย่างช้าๆ"</string> <string name="keyguard_low_battery" msgid="8143808018719173859">"เสียบที่ชาร์จของคุณ"</string> <string name="keyguard_instructions_when_pattern_disabled" msgid="1332288268600329841">"กด \"เมนู\" เพื่อปลดล็อก"</string> <string name="keyguard_network_locked_message" msgid="9169717779058037168">"เครือข่ายล็อก"</string> diff --git a/packages/Keyguard/src/com/android/keyguard/EmergencyButton.java b/packages/Keyguard/src/com/android/keyguard/EmergencyButton.java index 40c11cfcffc1..8d411453b5ae 100644 --- a/packages/Keyguard/src/com/android/keyguard/EmergencyButton.java +++ b/packages/Keyguard/src/com/android/keyguard/EmergencyButton.java @@ -16,15 +16,18 @@ package com.android.keyguard; +import android.app.ActivityManagerNative; import android.app.ActivityOptions; import android.content.Context; import android.content.Intent; import android.content.res.Configuration; import android.os.PowerManager; +import android.os.RemoteException; import android.os.SystemClock; import android.os.UserHandle; import android.telecom.TelecomManager; import android.util.AttributeSet; +import android.util.Slog; import android.view.View; import android.widget.Button; @@ -47,6 +50,8 @@ public class EmergencyButton extends Button { | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS | Intent.FLAG_ACTIVITY_CLEAR_TOP); + private static final String LOG_TAG = "EmergencyButton"; + KeyguardUpdateMonitorCallback mInfoCallback = new KeyguardUpdateMonitorCallback() { @Override @@ -122,6 +127,11 @@ public class EmergencyButton extends Button { // TODO: implement a shorter timeout once new PowerManager API is ready. // should be the equivalent to the old userActivity(EMERGENCY_CALL_TIMEOUT) mPowerManager.userActivity(SystemClock.uptimeMillis(), true); + try { + ActivityManagerNative.getDefault().stopSystemLockTaskMode(); + } catch (RemoteException e) { + Slog.w(LOG_TAG, "Failed to stop app pinning"); + } if (isInCall()) { resumeCall(); if (mEmergencyButtonCallback != null) { diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardPinBasedInputView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardPinBasedInputView.java index c8719f3f88e3..8d6e07e619ff 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardPinBasedInputView.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardPinBasedInputView.java @@ -239,8 +239,7 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView @Override public boolean onKey(View v, int keyCode, KeyEvent event) { if (event.getAction() == KeyEvent.ACTION_DOWN) { - onKeyDown(keyCode, event); - return true; + return onKeyDown(keyCode, event); } return false; } diff --git a/packages/PrintRecommendationService/res/values/donottranslate.xml b/packages/PrintRecommendationService/res/values/donottranslate.xml index 86027cda405a..e9b97a3d629d 100644 --- a/packages/PrintRecommendationService/res/values/donottranslate.xml +++ b/packages/PrintRecommendationService/res/values/donottranslate.xml @@ -32,12 +32,20 @@ <item>Hewlett Packard</item> </string-array> + <!-- Samsung plugin --> <string-array name="known_print_vendor_info_for_samsung" translatable="false"> <item>com.sec.app.samsungprintservice</item> <item>Samsung Electronics</item> <item>Samsung</item> </string-array> + <!-- Xerox plugin --> + <string-array name="known_print_vendor_info_for_xerox" translatable="false"> + <item>com.xerox.printservice</item> + <item>Xerox</item> + <item>Xerox</item> + </string-array> + <array name="known_print_plugin_vendors" translatable="false"> <item>@array/known_print_vendor_info_for_mopria</item> <item>@array/known_print_vendor_info_for_hp</item> diff --git a/packages/PrintRecommendationService/res/xml/vendorconfigs.xml b/packages/PrintRecommendationService/res/xml/vendorconfigs.xml index 108ea66c404e..52889ce186a4 100644 --- a/packages/PrintRecommendationService/res/xml/vendorconfigs.xml +++ b/packages/PrintRecommendationService/res/xml/vendorconfigs.xml @@ -43,14 +43,6 @@ </vendor> <vendor> - <name>@string/plugin_vendor_xerox</name> - <package>com.xerox.printservice</package> - <mdns-names> - <mdns-name>Xerox</mdns-name> - </mdns-names> - </vendor> - - <vendor> <name>@string/plugin_vendor_epson</name> <package>com.epson.mobilephone.android.epsonprintserviceplugin</package> <mdns-names> diff --git a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/RecommendationServiceImpl.java b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/RecommendationServiceImpl.java index d95654f7a247..ac60a88e5ca6 100644 --- a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/RecommendationServiceImpl.java +++ b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/RecommendationServiceImpl.java @@ -26,6 +26,7 @@ import com.android.printservice.recommendation.plugin.mdnsFilter.MDNSFilterPlugi import com.android.printservice.recommendation.plugin.mdnsFilter.VendorConfig; import com.android.printservice.recommendation.plugin.mopria.MopriaRecommendationPlugin; import com.android.printservice.recommendation.plugin.samsung.SamsungRecommendationPlugin; +import com.android.printservice.recommendation.plugin.xerox.XeroxPrintServiceRecommendationPlugin; import org.xmlpull.v1.XmlPullParserException; import java.io.IOException; @@ -83,6 +84,14 @@ public class RecommendationServiceImpl extends RecommendationService " plugin", e); } + try { + mPlugins.add(new RemotePrintServicePlugin( + new XeroxPrintServiceRecommendationPlugin(this), this, false)); + } catch (Exception e) { + Log.e(LOG_TAG, "Could not initiate " + getString(R.string.plugin_vendor_xerox) + + " plugin", e); + } + final int numPlugins = mPlugins.size(); for (int i = 0; i < numPlugins; i++) { try { diff --git a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/xerox/MDnsUtils.java b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/xerox/MDnsUtils.java new file mode 100755 index 000000000000..7a2d0d8957ea --- /dev/null +++ b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/xerox/MDnsUtils.java @@ -0,0 +1,91 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.printservice.recommendation.plugin.xerox; + +import android.net.nsd.NsdServiceInfo; +import android.text.TextUtils; + +import java.nio.charset.StandardCharsets; +import java.util.Locale; +import java.util.Map; + +class MDnsUtils { + public static final String ATTRIBUTE__TY = "ty"; + public static final String ATTRIBUTE__PRODUCT = "product"; + public static final String ATTRIBUTE__USB_MFG = "usb_MFG"; + public static final String ATTRIBUTE__USB_MDL = "usb_MDL"; + public static final String ATTRIBUTE__MFG = "mfg"; + public static final String EXCLUDE_FUJI = "fuji"; + public static final String PDL_ATTRIBUTE = "pdl"; + + public static boolean isVendorPrinter(NsdServiceInfo networkDevice, String[] vendorValues) { + + Map<String, byte[]> attributes = networkDevice.getAttributes(); + String product = getString(attributes.get(ATTRIBUTE__PRODUCT)); + String ty = getString(attributes.get(ATTRIBUTE__TY)); + String usbMfg = getString(attributes.get(ATTRIBUTE__USB_MFG)); + String usbMdl = getString(attributes.get(ATTRIBUTE__USB_MDL)); + String mfg = getString(attributes.get(ATTRIBUTE__MFG)); + return containsVendor(product, vendorValues) || containsVendor(ty, vendorValues) || containsVendor(usbMfg, vendorValues) || containsVendor(mfg, vendorValues) && !(containsString(ty, EXCLUDE_FUJI) || containsString(product, EXCLUDE_FUJI) || containsString(usbMdl, EXCLUDE_FUJI)); + + } + + public static String getVendor(NsdServiceInfo networkDevice) { + String vendor; + + Map<String, byte[]> attributes = networkDevice.getAttributes(); + vendor = getString(attributes.get(ATTRIBUTE__MFG)); + if (!TextUtils.isEmpty(vendor)) return vendor; + vendor = getString(attributes.get(ATTRIBUTE__USB_MFG)); + if (!TextUtils.isEmpty(vendor)) return vendor; + + return null; + } + + public static boolean checkPDLSupport(NsdServiceInfo networkDevice, String[] pdlFormats) { + if (pdlFormats == null) return false; + + String pdls = MDnsUtils.getString(networkDevice.getAttributes().get(PDL_ATTRIBUTE)); + if (pdls != null) { + for (String pdl : pdlFormats) { + if (pdls.contains(pdl)) { + return true; + } + } + } + return false; + } + + private static boolean containsVendor(String container, String[] vendorValues) { + if ((container == null) || (vendorValues == null)) return false; + for (String value : vendorValues) { + if (containsString(container, value) + || containsString(container.toLowerCase(Locale.US), value.toLowerCase(Locale.US)) + || containsString(container.toUpperCase(Locale.US), value.toUpperCase(Locale.US))) + return true; + } + return false; + } + + private static String getString(byte[] value) { + if (value != null) return new String(value, StandardCharsets.UTF_8); + return null; + } + + private static boolean containsString(String container, String contained) { + return (container != null) && (contained != null) && (container.equalsIgnoreCase(contained) || container.contains(contained + " ")); + } +} diff --git a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/xerox/PrinterHashMap.java b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/xerox/PrinterHashMap.java new file mode 100755 index 000000000000..b88c7c725349 --- /dev/null +++ b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/xerox/PrinterHashMap.java @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.printservice.recommendation.plugin.xerox; + +import android.net.nsd.NsdServiceInfo; + +import java.util.HashMap; + +final class PrinterHashMap extends HashMap<String, NsdServiceInfo> { + public static String getKey(NsdServiceInfo serviceInfo) { + return serviceInfo.getServiceName(); + } + + public NsdServiceInfo addPrinter(NsdServiceInfo device) { + return put(getKey(device), device); + } + + public NsdServiceInfo removePrinter(NsdServiceInfo device) { + return remove(getKey(device)); + } +} diff --git a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/xerox/ServiceResolver.java b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/xerox/ServiceResolver.java new file mode 100755 index 000000000000..f64eed47f785 --- /dev/null +++ b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/xerox/ServiceResolver.java @@ -0,0 +1,199 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.printservice.recommendation.plugin.xerox; + +import android.content.Context; +import android.net.nsd.NsdManager; +import android.net.nsd.NsdServiceInfo; +import android.text.TextUtils; +import com.android.printservice.recommendation.util.DiscoveryListenerMultiplexer; +import com.android.printservice.recommendation.util.NsdResolveQueue; + +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; + +class ServiceResolver { + + private final NsdManager mNSDManager; + private final String[] mServiceType; + private final Observer mObserver; + private final VendorInfo mVendorInfo; + private final String[] mPDLs; + private final PrinterHashMap mPrinterHashMap = new PrinterHashMap(); + private final List<NsdManager.DiscoveryListener> mListeners = new ArrayList<>(); + private final NsdResolveQueue mNsdResolveQueue; + + public interface Observer { + void dataSetChanged(); + } + + public ServiceResolver(Context context, Observer observer, VendorInfo vendorInfo, String[] serviceTypes, String[] pdls) { + mNsdResolveQueue = NsdResolveQueue.getInstance(); + mObserver = observer; + mServiceType = serviceTypes; + mNSDManager = (NsdManager) context.getSystemService(Context.NSD_SERVICE); + mVendorInfo = vendorInfo; + mPDLs = pdls; + } + + public void start() { + stop(); + for (final String service : mServiceType) { + NsdManager.DiscoveryListener listener = new NsdManager.DiscoveryListener() { + @Override + public void onStartDiscoveryFailed(String s, int i) { + + } + + @Override + public void onStopDiscoveryFailed(String s, int i) { + + } + + @Override + public void onDiscoveryStarted(String s) { + + } + + @Override + public void onDiscoveryStopped(String s) { + + } + + @Override + public void onServiceFound(NsdServiceInfo nsdServiceInfo) { + queueRequest(nsdServiceInfo); + } + + @Override + public void onServiceLost(NsdServiceInfo nsdServiceInfo) { + removeRequest(nsdServiceInfo); + printerRemoved(nsdServiceInfo); + } + }; + DiscoveryListenerMultiplexer.addListener(mNSDManager, service, listener); + mListeners.add(listener); + } + } + + public void stop() { + for (NsdManager.DiscoveryListener listener : mListeners) { + DiscoveryListenerMultiplexer.removeListener(mNSDManager, listener); + } + mListeners.clear(); + clearRequests(); + } + + //Resolving nsd services + private final LinkedList<NsdServiceInfo> mQueue = new LinkedList<>(); + private final Object mLock = new Object(); + private NsdServiceInfo mCurrentRequest = null; + + private void queueRequest(NsdServiceInfo serviceInfo) { + synchronized (mLock) { + if (mQueue.contains(serviceInfo)) return; + mQueue.add(serviceInfo); + makeNextRequest(); + } + } + + private void removeRequest(NsdServiceInfo serviceInfo) { + synchronized (mLock) { + mQueue.remove(serviceInfo); + if ((mCurrentRequest != null) && serviceInfo.equals(mCurrentRequest)) + mCurrentRequest = null; + } + } + + private void clearRequests() { + synchronized (mLock) { + mQueue.clear(); + } + } + + private void makeNextRequest() { + synchronized (mLock) { + if (mCurrentRequest != null) return; + if (mQueue.isEmpty()) return; + mCurrentRequest = mQueue.removeFirst(); + mNsdResolveQueue.resolve(mNSDManager, mCurrentRequest, new NsdManager.ResolveListener() { + @Override + public void onResolveFailed(NsdServiceInfo nsdServiceInfo, int i) { + synchronized (mLock) { + if (mCurrentRequest != null) mQueue.add(mCurrentRequest); + makeNextRequest(); + } + } + + @Override + public void onServiceResolved(NsdServiceInfo nsdServiceInfo) { + synchronized (mLock) { + if (mCurrentRequest != null) { + printerFound(nsdServiceInfo); + mCurrentRequest = null; + } + makeNextRequest(); + } + } + }); + + } + } + + private void printerFound(NsdServiceInfo nsdServiceInfo) { + if (nsdServiceInfo == null) return; + if (TextUtils.isEmpty(PrinterHashMap.getKey(nsdServiceInfo))) return; + String vendor = MDnsUtils.getVendor(nsdServiceInfo); + if (vendor == null) vendor = ""; + + for (String vendorValues : mVendorInfo.mDNSValues) { + if (vendor.equalsIgnoreCase(vendorValues)) { + vendor = mVendorInfo.mVendorID; + break; + } + } + + if ((vendor != mVendorInfo.mVendorID) && + MDnsUtils.isVendorPrinter(nsdServiceInfo, mVendorInfo.mDNSValues)) { + vendor = mVendorInfo.mVendorID; + } + + if (!(vendor == mVendorInfo.mVendorID)) { + return; + } + + if (!MDnsUtils.checkPDLSupport(nsdServiceInfo, mPDLs)) { + return; + } + + if ((mPrinterHashMap.addPrinter(nsdServiceInfo) == null)) { + mObserver.dataSetChanged(); + } + + } + + private void printerRemoved(NsdServiceInfo nsdServiceInfo) { + if ((mPrinterHashMap.removePrinter(nsdServiceInfo) != null)) { + mObserver.dataSetChanged(); + } + } + + public int getCount() { + return mPrinterHashMap.size(); + } + +} diff --git a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/xerox/VendorInfo.java b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/xerox/VendorInfo.java new file mode 100755 index 000000000000..20967a742896 --- /dev/null +++ b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/xerox/VendorInfo.java @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.printservice.recommendation.plugin.xerox; + +import android.content.res.Resources; + +import java.util.Arrays; + +final class VendorInfo { + + public final String mPackageName; + public final String mVendorID; + public final String[] mDNSValues; + public final int mID; + + public VendorInfo(Resources resources, int vendor_info_id) { + mID = vendor_info_id; + String[] data = resources.getStringArray(vendor_info_id); + if ((data == null) || (data.length < 2)) { + data = new String[]{null, null}; + } + mPackageName = data[0]; + mVendorID = data[1]; + mDNSValues = (data.length > 2) ? Arrays.copyOfRange(data, 2, data.length) : new String[]{}; + } +} diff --git a/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/xerox/XeroxPrintServiceRecommendationPlugin.java b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/xerox/XeroxPrintServiceRecommendationPlugin.java new file mode 100755 index 000000000000..3fb9ca239716 --- /dev/null +++ b/packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/xerox/XeroxPrintServiceRecommendationPlugin.java @@ -0,0 +1,79 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.printservice.recommendation.plugin.xerox; + +import android.content.Context; +import android.net.nsd.NsdManager; +import android.annotation.NonNull; +import com.android.printservice.recommendation.PrintServicePlugin; + +import com.android.printservice.recommendation.R; + +public class XeroxPrintServiceRecommendationPlugin implements PrintServicePlugin, ServiceResolver.Observer { + + protected final Object mLock = new Object(); + protected PrinterDiscoveryCallback mDiscoveryCallback = null; + protected final ServiceResolver mServiceResolver; + protected final NsdManager mNSDManager; + protected final VendorInfo mVendorInfo; + private final int mVendorStringID = R.string.plugin_vendor_xerox; + private final String PDL__PDF = "application/pdf"; + private final String[] mServices = new String[]{"_ipp._tcp"}; + + public XeroxPrintServiceRecommendationPlugin(Context context) { + mNSDManager = (NsdManager) context.getSystemService(Context.NSD_SERVICE); + mVendorInfo = new VendorInfo(context.getResources(), R.array.known_print_vendor_info_for_xerox); + mServiceResolver = new ServiceResolver(context, this, mVendorInfo, mServices, new String[]{PDL__PDF}); + } + + @Override + public int getName() { + return mVendorStringID; + } + + @NonNull + @Override + public CharSequence getPackageName() { + return mVendorInfo.mPackageName; + } + + @Override + public void start(@NonNull PrinterDiscoveryCallback callback) throws Exception { + synchronized (mLock) { + mDiscoveryCallback = callback; + mServiceResolver.start(); + } + } + + @Override + public void stop() throws Exception { + synchronized (mLock) { + mDiscoveryCallback = null; + mServiceResolver.stop(); + } + } + + @Override + public void dataSetChanged() { + synchronized (mLock) { + if (mDiscoveryCallback != null) mDiscoveryCallback.onChanged(getCount()); + } + } + + public int getCount() { + return mServiceResolver.getCount(); + } +} diff --git a/packages/PrintSpooler/res/layout/print_activity_controls.xml b/packages/PrintSpooler/res/layout/print_activity_controls.xml index 248d0c05934a..69d4f914a453 100644 --- a/packages/PrintSpooler/res/layout/print_activity_controls.xml +++ b/packages/PrintSpooler/res/layout/print_activity_controls.xml @@ -239,7 +239,7 @@ android:singleLine="true" android:ellipsize="end" android:visibility="visible" - android:inputType="number" + android:inputType="textNoSuggestions" android:digits="0123456789 ,-"> </com.android.printspooler.widget.CustomErrorEditText> diff --git a/packages/PrintSpooler/res/values-kk-rKZ/strings.xml b/packages/PrintSpooler/res/values-kk-rKZ/strings.xml index 505e07dc4526..dbf4de4339ec 100644 --- a/packages/PrintSpooler/res/values-kk-rKZ/strings.xml +++ b/packages/PrintSpooler/res/values-kk-rKZ/strings.xml @@ -16,7 +16,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_label" msgid="4469836075319831821">"Басу спулері"</string> + <string name="app_label" msgid="4469836075319831821">"Print Spooler"</string> <string name="more_options_button" msgid="2243228396432556771">"Басқа опциялар"</string> <string name="label_destination" msgid="9132510997381599275">"Принтер"</string> <string name="label_copies" msgid="3634531042822968308">"Дана"</string> diff --git a/packages/PrintSpooler/res/values-my-rMM/strings.xml b/packages/PrintSpooler/res/values-my-rMM/strings.xml index b51336eb6dac..c277c558b965 100644 --- a/packages/PrintSpooler/res/values-my-rMM/strings.xml +++ b/packages/PrintSpooler/res/values-my-rMM/strings.xml @@ -81,7 +81,7 @@ <string name="cancelling_notification_title_template" msgid="1821759594704703197">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> ကို ပယ်ဖျက်နေပါသည်"</string> <string name="failed_notification_title_template" msgid="2256217208186530973">"စာထုတ်စက်မှ အမှား <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string> <string name="blocked_notification_title_template" msgid="1175435827331588646">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>ကိုစာထုတ်စက်ကငြင်းလိုက်သည်"</string> - <string name="cancel" msgid="4373674107267141885">"ဖျက်သိမ်းရန်"</string> + <string name="cancel" msgid="4373674107267141885">"မလုပ်တော့ပါ"</string> <string name="restart" msgid="2472034227037808749">"အစက ပြန်စရန်"</string> <string name="no_connection_to_printer" msgid="2159246915977282728">"စာထုတ်စက်နဲ့ ဆက်သွယ်ထားမှု မရှိပါ"</string> <string name="reason_unknown" msgid="5507940196503246139">"အကြောင်းအရာ မသိရှိ"</string> diff --git a/packages/PrintSpooler/res/values-pa-rIN/strings.xml b/packages/PrintSpooler/res/values-pa-rIN/strings.xml index 8a5fc97d7919..c09713ee4c32 100644 --- a/packages/PrintSpooler/res/values-pa-rIN/strings.xml +++ b/packages/PrintSpooler/res/values-pa-rIN/strings.xml @@ -35,7 +35,7 @@ <string name="install_for_print_preview" msgid="6366303997385509332">"ਪ੍ਰੀਵਿਊ ਲਈ PDF ਵਿਊਅਰ ਇੰਸਟੌਲ ਕਰੋ"</string> <string name="printing_app_crashed" msgid="854477616686566398">"ਪ੍ਰਿੰਟਿੰਗ ਐਪ ਕ੍ਰੈਸ਼ ਹੋਇਆ"</string> <string name="generating_print_job" msgid="3119608742651698916">"ਪ੍ਰਿੰਟ ਜੌਬ ਬਣਾ ਰਿਹਾ ਹੈ"</string> - <string name="save_as_pdf" msgid="5718454119847596853">"PDF ਦੇ ਤੌਰ ਤੇ ਸੁਰੱਖਿਅਤ ਕਰੋ"</string> + <string name="save_as_pdf" msgid="5718454119847596853">"PDF ਦੇ ਤੌਰ ਤੇ ਰੱਖਿਅਤ ਕਰੋ"</string> <string name="all_printers" msgid="5018829726861876202">"ਸਾਰੇ ਪ੍ਰਿੰਟਰ…"</string> <string name="print_dialog" msgid="32628687461331979">"ਪ੍ਰਿੰਟ ਡਾਇਲੌਗ"</string> <string name="current_page_template" msgid="1386638343571771292">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g> /<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string> @@ -44,7 +44,7 @@ <string name="expand_handle" msgid="7282974448109280522">"ਹੈਂਡਲ ਨੂੰ ਵਿਸਤਾਰ ਦਿਓ"</string> <string name="collapse_handle" msgid="6886637989442507451">"ਇਕੱਠਾ ਹੋਣ ਦੀ ਸੰਭਾਲ"</string> <string name="print_button" msgid="645164566271246268">"ਪ੍ਰਿੰਟ"</string> - <string name="savetopdf_button" msgid="2976186791686924743">"PDF ਵਿੱਚ ਸੁਰੱਖਿਅਤ ਕਰੋ"</string> + <string name="savetopdf_button" msgid="2976186791686924743">"PDF ਵਿੱਚ ਰੱਖਿਅਤ ਕਰੋ"</string> <string name="print_options_expanded" msgid="6944679157471691859">"ਪ੍ਰਿੰਟ ਚੋਣਾਂ ਦਾ ਵਿਸਤਾਰ ਕੀਤਾ"</string> <string name="print_options_collapsed" msgid="7455930445670414332">"ਪ੍ਰਿੰਟ ਚੋਣਾਂ ਇਕੱਠਾ ਹੋਈਆਂ"</string> <string name="search" msgid="5421724265322228497">"ਖੋਜੋ"</string> diff --git a/packages/PrintSpooler/src/com/android/printspooler/renderer/PdfManipulationService.java b/packages/PrintSpooler/src/com/android/printspooler/renderer/PdfManipulationService.java index 0feda92322d0..c74c6a7182bc 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/renderer/PdfManipulationService.java +++ b/packages/PrintSpooler/src/com/android/printspooler/renderer/PdfManipulationService.java @@ -277,18 +277,12 @@ public final class PdfManipulationService extends Service { Rect cropBox = new Rect(); Matrix transform = new Matrix(); - final boolean contentPortrait = attributes.getMediaSize().isPortrait(); - final boolean layoutDirectionRtl = getResources().getConfiguration() .getLayoutDirection() == View.LAYOUT_DIRECTION_RTL; // We do not want to rotate the media box, so take into account orientation. - final int dstWidthPts = contentPortrait - ? pointsFromMils(attributes.getMediaSize().getWidthMils()) - : pointsFromMils(attributes.getMediaSize().getHeightMils()); - final int dstHeightPts = contentPortrait - ? pointsFromMils(attributes.getMediaSize().getHeightMils()) - : pointsFromMils(attributes.getMediaSize().getWidthMils()); + final int dstWidthPts = pointsFromMils(attributes.getMediaSize().getWidthMils()); + final int dstHeightPts = pointsFromMils(attributes.getMediaSize().getHeightMils()); final boolean scaleForPrinting = mEditor.shouldScaleForPrinting(); @@ -310,24 +304,12 @@ public final class PdfManipulationService extends Service { // Make sure content is top-left after media box resize. transform.setTranslate(0, srcHeightPts - dstHeightPts); - // Rotate the content if in landscape. - if (!contentPortrait) { - transform.postRotate(270); - transform.postTranslate(0, dstHeightPts); - } - // Scale the content if document allows it. final float scale; if (scaleForPrinting) { - if (contentPortrait) { - scale = Math.min((float) dstWidthPts / srcWidthPts, - (float) dstHeightPts / srcHeightPts); - transform.postScale(scale, scale); - } else { - scale = Math.min((float) dstWidthPts / srcHeightPts, - (float) dstHeightPts / srcWidthPts); - transform.postScale(scale, scale, mediaBox.left, mediaBox.bottom); - } + scale = Math.min((float) dstWidthPts / srcWidthPts, + (float) dstHeightPts / srcHeightPts); + transform.postScale(scale, scale); } else { scale = 1.0f; } @@ -344,10 +326,8 @@ public final class PdfManipulationService extends Service { // If in RTL mode put the content in the logical top-right corner. if (layoutDirectionRtl) { - final float dx = contentPortrait - ? dstWidthPts - (int) (srcWidthPts * scale + 0.5f) : 0; - final float dy = contentPortrait - ? 0 : - (dstHeightPts - (int) (srcWidthPts * scale + 0.5f)); + final float dx = dstWidthPts - (int) (srcWidthPts * scale + 0.5f); + final float dy = 0; transform.postTranslate(dx, dy); } diff --git a/packages/SettingsLib/res/drawable/notification_auto_importance.xml b/packages/SettingsLib/res/drawable/notification_auto_importance.xml index a63e911b9ffc..c94615312306 100644 --- a/packages/SettingsLib/res/drawable/notification_auto_importance.xml +++ b/packages/SettingsLib/res/drawable/notification_auto_importance.xml @@ -20,8 +20,8 @@ android:viewportHeight="24.0"> <path android:fillColor="#FFFFFFFF" - android:pathData="M11.2,13.6l1.6,0l-0.8,-2.6z"/> + android:pathData="M10.8,12.7l2.4,0l-1.2,-3.7z"/> <path android:fillColor="#FF000000" - android:pathData="M22.5,9.6L15,9l-3,-7L9,9L1.5,9.6l5.7,5L5.5,22l6.5,-3.9l6.5,3.9l-1.7,-7.4L22.5,9.6zM13.6,16l-0.5,-1.4h-2.3L10.4,16H9l2.3,-6.4h1.4L15,16H13.6z"/> + android:pathData="M12,2C6.5,2 2,6.5 2,12s4.5,10 10,10s10,-4.5 10,-10S17.5,2 12,2zM14.3,16l-0.7,-2h-3.2l-0.7,2H7.8L11,7h2l3.2,9H14.3z"/> </vector>
\ No newline at end of file diff --git a/packages/SettingsLib/res/values-af/strings.xml b/packages/SettingsLib/res/values-af/strings.xml index fe726264de9d..eae49c4bfa18 100644 --- a/packages/SettingsLib/res/values-af/strings.xml +++ b/packages/SettingsLib/res/values-af/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Geaktiveer deur administrateur"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Gedeaktiveer deur administrateur"</string> <string name="home" msgid="3256884684164448244">"Instellingstuisblad"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> gelede"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> oor"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Klein"</string> diff --git a/packages/SettingsLib/res/values-am/strings.xml b/packages/SettingsLib/res/values-am/strings.xml index 843db182cd7d..4fd425915a87 100644 --- a/packages/SettingsLib/res/values-am/strings.xml +++ b/packages/SettingsLib/res/values-am/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"በአስተዳዳሪ የነቃ"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"በአስተዳዳሪ የተሰናከለ"</string> <string name="home" msgid="3256884684164448244">"የቅንብሮች መነሻ"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"ከ<xliff:g id="ID_1">%1$s</xliff:g> በፊት"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> ቀርቷል"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"ትንሽ"</string> diff --git a/packages/SettingsLib/res/values-ar/strings.xml b/packages/SettingsLib/res/values-ar/strings.xml index 27050d1e2942..246880cc2a82 100644 --- a/packages/SettingsLib/res/values-ar/strings.xml +++ b/packages/SettingsLib/res/values-ar/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"تم التمكين بواسطة المشرف"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"تم التعطيل بواسطة المشرف"</string> <string name="home" msgid="3256884684164448244">"الشاشة الرئيسية للإعدادات"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"٠٪"</item> + <item msgid="8934126114226089439">"٪۵۰"</item> + <item msgid="1286113608943010849">"٪۱۰۰"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"قبل <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="remaining_length_format" msgid="7886337596669190587">"يتبقى <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"صغير"</string> diff --git a/packages/SettingsLib/res/values-az-rAZ/strings.xml b/packages/SettingsLib/res/values-az-rAZ/strings.xml index 414bcd437180..0caeea0eb1d8 100644 --- a/packages/SettingsLib/res/values-az-rAZ/strings.xml +++ b/packages/SettingsLib/res/values-az-rAZ/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Administrator tərəfindən aktiv edildi"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Administrator tərəfindən deaktiv edildi"</string> <string name="home" msgid="3256884684164448244">"Ayarların əsas səhifəsi"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> əvvəl"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> qalıb"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Kiçik"</string> diff --git a/packages/SettingsLib/res/values-b+sr+Latn/strings.xml b/packages/SettingsLib/res/values-b+sr+Latn/strings.xml index 2239dee54e7e..a61462da0e60 100644 --- a/packages/SettingsLib/res/values-b+sr+Latn/strings.xml +++ b/packages/SettingsLib/res/values-b+sr+Latn/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Omogućio je administrator"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Onemogućio je administrator"</string> <string name="home" msgid="3256884684164448244">"Početna za Podešavanja"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"Pre <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="remaining_length_format" msgid="7886337596669190587">"Još <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Mali"</string> diff --git a/packages/SettingsLib/res/values-be-rBY/arrays.xml b/packages/SettingsLib/res/values-be-rBY/arrays.xml index 63b8b9bf6f4e..9ac862b7a219 100644 --- a/packages/SettingsLib/res/values-be-rBY/arrays.xml +++ b/packages/SettingsLib/res/values-be-rBY/arrays.xml @@ -128,12 +128,12 @@ <item msgid="1340692776955662664">"Выклікаць стэк на glGetError"</item> </string-array> <string-array name="show_non_rect_clip_entries"> - <item msgid="993742912147090253">"Адключана"</item> + <item msgid="993742912147090253">"Выключана"</item> <item msgid="675719912558941285">"Намаляваць непрамавугольную вобласць кліпа сінім колерам"</item> <item msgid="1064373276095698656">"Вылучыце выпрабаваныя каманды малявання зялёным колерам"</item> </string-array> <string-array name="track_frame_time_entries"> - <item msgid="2193584639058893150">"Адключана"</item> + <item msgid="2193584639058893150">"Выключана"</item> <item msgid="2751513398307949636">"На экране ў выглядзе слупкоў"</item> <item msgid="1851438178120770973">"У абалонцы adb dumpsys gfxinfo"</item> </string-array> diff --git a/packages/SettingsLib/res/values-be-rBY/strings.xml b/packages/SettingsLib/res/values-be-rBY/strings.xml index 7e13220467f7..5d4d68829ae3 100644 --- a/packages/SettingsLib/res/values-be-rBY/strings.xml +++ b/packages/SettingsLib/res/values-be-rBY/strings.xml @@ -237,12 +237,12 @@ <string name="force_msaa" msgid="7920323238677284387">"Прымусовае выкананне 4x MSAA"</string> <string name="force_msaa_summary" msgid="9123553203895817537">"Уключыць 4x MSAA у прыкладаннях з OpenGL ES 2.0"</string> <string name="show_non_rect_clip" msgid="505954950474595172">"Адладка аперацый непрамавугольнага кліпа"</string> - <string name="track_frame_time" msgid="6146354853663863443">"Профіль рэндэрінгу GPU"</string> + <string name="track_frame_time" msgid="6146354853663863443">"Профіль рэндэрынгу GPU"</string> <string name="window_animation_scale_title" msgid="6162587588166114700">"Маштаб анімацыі акна"</string> <string name="transition_animation_scale_title" msgid="387527540523595875">"Маштаб перадачы анімацыі"</string> <string name="animator_duration_scale_title" msgid="3406722410819934083">"Шкала працягласці анiматара"</string> <string name="overlay_display_devices_title" msgid="5364176287998398539">"Мадэляванне другасных дысплеяў"</string> - <string name="debug_applications_category" msgid="4206913653849771549">"Прыкладаннi"</string> + <string name="debug_applications_category" msgid="4206913653849771549">"Праграмы"</string> <string name="immediately_destroy_activities" msgid="1579659389568133959">"Не захоўваць дзеянні"</string> <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Знішч. кож.дзеянне, як толькі карыст.пакідае яго"</string> <string name="app_process_limit_title" msgid="4280600650253107163">"Ліміт фонавага працэсу"</string> @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Уключана адміністратарам"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Адключана адміністратарам"</string> <string name="home" msgid="3256884684164448244">"Галоўная старонка налад"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0 %"</item> + <item msgid="8934126114226089439">"50 %"</item> + <item msgid="1286113608943010849">"100 %"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> таму назад"</string> <string name="remaining_length_format" msgid="7886337596669190587">"Засталося <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Маленькі"</string> diff --git a/packages/SettingsLib/res/values-bg/strings.xml b/packages/SettingsLib/res/values-bg/strings.xml index b410590344e7..efc88ca3fdd3 100644 --- a/packages/SettingsLib/res/values-bg/strings.xml +++ b/packages/SettingsLib/res/values-bg/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Активирано от администратора"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Деактивирано от администратора"</string> <string name="home" msgid="3256884684164448244">"Начален екран на Настройки"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"Преди <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="remaining_length_format" msgid="7886337596669190587">"Оставащо време: <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Малко"</string> diff --git a/packages/SettingsLib/res/values-bn-rBD/strings.xml b/packages/SettingsLib/res/values-bn-rBD/strings.xml index 2019097a2ee6..37176433552d 100644 --- a/packages/SettingsLib/res/values-bn-rBD/strings.xml +++ b/packages/SettingsLib/res/values-bn-rBD/strings.xml @@ -177,7 +177,7 @@ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"লগ বাফার প্রতি অপেক্ষাকৃত বড় আকারগুলির নির্বাচন করুন"</string> <string name="select_usb_configuration_title" msgid="2649938511506971843">"USB কনফিগারেশন নির্বাচন করুন"</string> <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"USB কনফিগারেশন নির্বাচন করুন"</string> - <string name="allow_mock_location" msgid="2787962564578664888">"নকল অবস্থানের মঞ্জুরি দিন"</string> + <string name="allow_mock_location" msgid="2787962564578664888">"নকল অবস্থানের অনুমতি দিন"</string> <string name="allow_mock_location_summary" msgid="317615105156345626">"মক অবস্থানগুলি মঞ্জুর করুন"</string> <string name="debug_view_attributes" msgid="6485448367803310384">"অ্যাট্রিবিউট পরিদর্শন দেখা সক্ষম করুন"</string> <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"নতুন Android DHCP ক্লায়েন্টের পরিবর্তে Lollipop এর থেকে DHCP ক্লায়েন্ট ব্যবহার করুন৷"</string> @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"প্রশাসক সক্ষম করেছেন"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"প্রশাসক অক্ষম করেছেন"</string> <string name="home" msgid="3256884684164448244">"সেটিংস হোম"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"০%"</item> + <item msgid="8934126114226089439">"৫০%"</item> + <item msgid="1286113608943010849">"১০০%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> আগে"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> বাকী আছে"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"ক্ষুদ্র"</string> diff --git a/packages/SettingsLib/res/values-bs-rBA/strings.xml b/packages/SettingsLib/res/values-bs-rBA/strings.xml index 995d85629ffa..28e3507a2ad6 100644 --- a/packages/SettingsLib/res/values-bs-rBA/strings.xml +++ b/packages/SettingsLib/res/values-bs-rBA/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Omogućio administrator"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Onemogućio je administrator"</string> <string name="home" msgid="3256884684164448244">"Postavke početne stranice"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"prije <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="remaining_length_format" msgid="7886337596669190587">"Još otprilike <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Malo"</string> diff --git a/packages/SettingsLib/res/values-ca/strings.xml b/packages/SettingsLib/res/values-ca/strings.xml index ef52df5da28e..24873135a6bf 100644 --- a/packages/SettingsLib/res/values-ca/strings.xml +++ b/packages/SettingsLib/res/values-ca/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Opció activada per l\'administrador"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Opció desactivada per l\'administrador"</string> <string name="home" msgid="3256884684164448244">"Pàgina d\'inici de configuració"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"Fa <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="remaining_length_format" msgid="7886337596669190587">"Temps restant: <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Petit"</string> diff --git a/packages/SettingsLib/res/values-cs/strings.xml b/packages/SettingsLib/res/values-cs/strings.xml index bb0b608dcfd3..42c7bdf8fd9e 100644 --- a/packages/SettingsLib/res/values-cs/strings.xml +++ b/packages/SettingsLib/res/values-cs/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Povoleno administrátorem"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Zakázáno administrátorem"</string> <string name="home" msgid="3256884684164448244">"Domovská stránka Nastavení"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0 %"</item> + <item msgid="8934126114226089439">"50 %"</item> + <item msgid="1286113608943010849">"100 %"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"před <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="remaining_length_format" msgid="7886337596669190587">"Zbývající čas: <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Malé"</string> diff --git a/packages/SettingsLib/res/values-da/strings.xml b/packages/SettingsLib/res/values-da/strings.xml index df024c3eaac9..8f8d7a6623d7 100644 --- a/packages/SettingsLib/res/values-da/strings.xml +++ b/packages/SettingsLib/res/values-da/strings.xml @@ -237,7 +237,7 @@ <string name="force_msaa" msgid="7920323238677284387">"Tving 4x MSAA"</string> <string name="force_msaa_summary" msgid="9123553203895817537">"Aktivér 4x MSAA i apps med OpenGL ES 2.0"</string> <string name="show_non_rect_clip" msgid="505954950474595172">"Fejlfind på ikke-rektangulære klippehandlinger"</string> - <string name="track_frame_time" msgid="6146354853663863443">"GPU-gengivelse for profil"</string> + <string name="track_frame_time" msgid="6146354853663863443">"GPU-profilgengivelse"</string> <string name="window_animation_scale_title" msgid="6162587588166114700">"Animationsskala for vindue"</string> <string name="transition_animation_scale_title" msgid="387527540523595875">"Overgangsanimationsskala"</string> <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animatorvarighedsskala"</string> @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Aktiveret af administratoren"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Deaktiveret af administratoren"</string> <string name="home" msgid="3256884684164448244">"Startside for Indstillinger"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0 %"</item> + <item msgid="8934126114226089439">"50 %"</item> + <item msgid="1286113608943010849">"100 %"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> siden"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> tilbage"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Lille"</string> diff --git a/packages/SettingsLib/res/values-de/strings.xml b/packages/SettingsLib/res/values-de/strings.xml index 16b6acee5107..169d6b01a36c 100644 --- a/packages/SettingsLib/res/values-de/strings.xml +++ b/packages/SettingsLib/res/values-de/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Vom Administrator aktiviert"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Vom Administrator deaktiviert"</string> <string name="home" msgid="3256884684164448244">"Startseite \"Einstellungen\""</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0 %"</item> + <item msgid="8934126114226089439">"50 %"</item> + <item msgid="1286113608943010849">"100 %"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"Vor <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="remaining_length_format" msgid="7886337596669190587">"Noch <xliff:g id="ID_1">%1$s</xliff:g> verbleibend"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Klein"</string> diff --git a/packages/SettingsLib/res/values-el/strings.xml b/packages/SettingsLib/res/values-el/strings.xml index 7827ab991588..c52514550f2a 100644 --- a/packages/SettingsLib/res/values-el/strings.xml +++ b/packages/SettingsLib/res/values-el/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Ενεργοποιήθηκε από το διαχειριστή"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Απενεργοποιήθηκε από το διαχειριστή"</string> <string name="home" msgid="3256884684164448244">"Αρχική σελίδα ρυθμίσεων"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"Πριν από <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="remaining_length_format" msgid="7886337596669190587">"Απομένουν <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Μικρά"</string> diff --git a/packages/SettingsLib/res/values-en-rAU/strings.xml b/packages/SettingsLib/res/values-en-rAU/strings.xml index ec3d04b301c0..05fc9db8e93f 100644 --- a/packages/SettingsLib/res/values-en-rAU/strings.xml +++ b/packages/SettingsLib/res/values-en-rAU/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Enabled by administrator"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Disabled by administrator"</string> <string name="home" msgid="3256884684164448244">"Settings Home"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> ago"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> left"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Small"</string> diff --git a/packages/SettingsLib/res/values-en-rGB/strings.xml b/packages/SettingsLib/res/values-en-rGB/strings.xml index ec3d04b301c0..05fc9db8e93f 100644 --- a/packages/SettingsLib/res/values-en-rGB/strings.xml +++ b/packages/SettingsLib/res/values-en-rGB/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Enabled by administrator"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Disabled by administrator"</string> <string name="home" msgid="3256884684164448244">"Settings Home"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> ago"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> left"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Small"</string> diff --git a/packages/SettingsLib/res/values-en-rIN/strings.xml b/packages/SettingsLib/res/values-en-rIN/strings.xml index ec3d04b301c0..05fc9db8e93f 100644 --- a/packages/SettingsLib/res/values-en-rIN/strings.xml +++ b/packages/SettingsLib/res/values-en-rIN/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Enabled by administrator"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Disabled by administrator"</string> <string name="home" msgid="3256884684164448244">"Settings Home"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> ago"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> left"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Small"</string> diff --git a/packages/SettingsLib/res/values-es-rUS/strings.xml b/packages/SettingsLib/res/values-es-rUS/strings.xml index 2facecbe23f8..2fd5e9b0bf9f 100644 --- a/packages/SettingsLib/res/values-es-rUS/strings.xml +++ b/packages/SettingsLib/res/values-es-rUS/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Habilitada por el administrador"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Inhabilitada por el administrador"</string> <string name="home" msgid="3256884684164448244">"Pantalla de configuración"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"Hace <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="remaining_length_format" msgid="7886337596669190587">"Falta <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Pequeño"</string> diff --git a/packages/SettingsLib/res/values-es/strings.xml b/packages/SettingsLib/res/values-es/strings.xml index 163e846f9fce..c6cddd94354b 100644 --- a/packages/SettingsLib/res/values-es/strings.xml +++ b/packages/SettingsLib/res/values-es/strings.xml @@ -226,7 +226,7 @@ <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Habilitar seguimiento OpenGL"</string> <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Sin enrutamiento audio USB"</string> <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Inhabilitar el enrutamiento automático a periféricos de audio USB"</string> - <string name="debug_layout" msgid="5981361776594526155">"Mostrar límites de diseño"</string> + <string name="debug_layout" msgid="5981361776594526155">"Mostrar límites diseño"</string> <string name="debug_layout_summary" msgid="2001775315258637682">"Mostrar límites de vídeo, márgenes, etc."</string> <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Forzar dirección diseño RTL"</string> <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Forzar dirección (RTL) para todas configuraciones"</string> @@ -237,7 +237,7 @@ <string name="force_msaa" msgid="7920323238677284387">"Forzar MSAA 4x"</string> <string name="force_msaa_summary" msgid="9123553203895817537">"Habilitar MSAA 4x en aplicaciones de OpenGL ES 2.0"</string> <string name="show_non_rect_clip" msgid="505954950474595172">"Depurar operaciones de recorte no rectangulares"</string> - <string name="track_frame_time" msgid="6146354853663863443">"Perfil de renderización de GPU"</string> + <string name="track_frame_time" msgid="6146354853663863443">"Perfil renderización GPU"</string> <string name="window_animation_scale_title" msgid="6162587588166114700">"Escala de animación de ventana"</string> <string name="transition_animation_scale_title" msgid="387527540523595875">"Escala de transición-animación"</string> <string name="animator_duration_scale_title" msgid="3406722410819934083">"Escala de duración de animación"</string> @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Habilitado por el administrador"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Inhabilitado por el administrador"</string> <string name="home" msgid="3256884684164448244">"Página principal de ajustes"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"Hace <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="remaining_length_format" msgid="7886337596669190587">"Tiempo restante: <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Pequeño"</string> diff --git a/packages/SettingsLib/res/values-et-rEE/strings.xml b/packages/SettingsLib/res/values-et-rEE/strings.xml index 756e4ad49717..cda3d9f1cf09 100644 --- a/packages/SettingsLib/res/values-et-rEE/strings.xml +++ b/packages/SettingsLib/res/values-et-rEE/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Administraator on lubanud"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Administraator on keelanud"</string> <string name="home" msgid="3256884684164448244">"Seadete avaleht"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> tagasi"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> on jäänud"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Väike"</string> diff --git a/packages/SettingsLib/res/values-eu-rES/strings.xml b/packages/SettingsLib/res/values-eu-rES/strings.xml index b6db37aff389..76f7798aed09 100644 --- a/packages/SettingsLib/res/values-eu-rES/strings.xml +++ b/packages/SettingsLib/res/values-eu-rES/strings.xml @@ -98,7 +98,7 @@ <string name="launch_defaults_some" msgid="313159469856372621">"Hobespen lehenetsi batzuk ezarrita daude"</string> <string name="launch_defaults_none" msgid="4241129108140034876">"Ez dago hobespen lehenetsirik ezarrita"</string> <string name="tts_settings" msgid="8186971894801348327">"Testua ahots bihurtzeko eginbidearen ezarpenak"</string> - <string name="tts_settings_title" msgid="1237820681016639683">"Testua ahots bihurtzeko eginbidearen irteera"</string> + <string name="tts_settings_title" msgid="1237820681016639683">"Testua ahots bihurtzeko eginbidea"</string> <string name="tts_default_rate_title" msgid="6030550998379310088">"Hizketaren abiadura"</string> <string name="tts_default_rate_summary" msgid="4061815292287182801">"Testua zer abiaduran esaten den"</string> <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tonua"</string> @@ -323,7 +323,12 @@ <string name="disabled_by_admin_summary_text" msgid="6750513964908334617">"Administratzaileak kontrolatzen du"</string> <string name="enabled_by_admin" msgid="2386503803463071894">"Administratzaileak gaitu du"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Administratzaileak desgaitu du"</string> - <string name="home" msgid="3256884684164448244">"Ezarpenen orri nagusia"</string> + <string name="home" msgid="3256884684164448244">"Ezarpenen hasierako pantaila"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"% 0"</item> + <item msgid="8934126114226089439">"% 50"</item> + <item msgid="1286113608943010849">"% 100"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"Duela <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> guztiz kargatu arte"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Txikia"</string> diff --git a/packages/SettingsLib/res/values-fa/arrays.xml b/packages/SettingsLib/res/values-fa/arrays.xml index 1b4e335748ed..e59759254f57 100644 --- a/packages/SettingsLib/res/values-fa/arrays.xml +++ b/packages/SettingsLib/res/values-fa/arrays.xml @@ -24,7 +24,7 @@ <item msgid="1922181315419294640"></item> <item msgid="8934131797783724664">"اسکن کردن..."</item> <item msgid="8513729475867537913">"در حال اتصال…"</item> - <item msgid="515055375277271756">"در حال تأیید اعتبار..."</item> + <item msgid="515055375277271756">"در حال راستیآزمایی..."</item> <item msgid="1943354004029184381">"در حال دریافت آدرس IP..."</item> <item msgid="4221763391123233270">"متصل"</item> <item msgid="624838831631122137">"معلق"</item> @@ -38,7 +38,7 @@ <item msgid="7714855332363650812"></item> <item msgid="8878186979715711006">"اسکن کردن..."</item> <item msgid="355508996603873860">"در حال اتصال به <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item> - <item msgid="554971459996405634">"در حال تأیید اعتبار با <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item> + <item msgid="554971459996405634">"در حال راستیآزمایی با <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item> <item msgid="7928343808033020343">"در حال دریافت آدرس IP از <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item> <item msgid="8937994881315223448">"متصل شد به <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item> <item msgid="1330262655415760617">"معلق"</item> diff --git a/packages/SettingsLib/res/values-fa/strings.xml b/packages/SettingsLib/res/values-fa/strings.xml index 2f0f8c873a74..8729ffd8159d 100644 --- a/packages/SettingsLib/res/values-fa/strings.xml +++ b/packages/SettingsLib/res/values-fa/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"سرپرست آن را فعال کرده است"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"سرپرست آن را غیرفعال کرده است"</string> <string name="home" msgid="3256884684164448244">"صفحه اصلی تنظیمات"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"٪۰"</item> + <item msgid="8934126114226089439">"۵۰٪"</item> + <item msgid="1286113608943010849">"۱۰۰٪"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> قبل"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> باقی مانده است"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"کوچک"</string> diff --git a/packages/SettingsLib/res/values-fi/strings.xml b/packages/SettingsLib/res/values-fi/strings.xml index 1f2579b48b21..5c4287a75bfe 100644 --- a/packages/SettingsLib/res/values-fi/strings.xml +++ b/packages/SettingsLib/res/values-fi/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Järjestelmänvalvojan käyttöön ottama"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Järjestelmänvalvojan käytöstä poistama"</string> <string name="home" msgid="3256884684164448244">"Asetusten etusivu"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0 %"</item> + <item msgid="8934126114226089439">"50 %"</item> + <item msgid="1286113608943010849">"100 %"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> sitten"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> jäljellä"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Pieni"</string> diff --git a/packages/SettingsLib/res/values-fr-rCA/strings.xml b/packages/SettingsLib/res/values-fr-rCA/strings.xml index 2ada1362526c..6f7982d4834d 100644 --- a/packages/SettingsLib/res/values-fr-rCA/strings.xml +++ b/packages/SettingsLib/res/values-fr-rCA/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Activé par l\'administrateur"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Désactivé par l\'administrateur"</string> <string name="home" msgid="3256884684164448244">"Accueil des paramètres"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0 %"</item> + <item msgid="8934126114226089439">"50 %"</item> + <item msgid="1286113608943010849">"100 %"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"Il y a <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="remaining_length_format" msgid="7886337596669190587">"Durée restante :<xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Petite"</string> diff --git a/packages/SettingsLib/res/values-fr/strings.xml b/packages/SettingsLib/res/values-fr/strings.xml index ac8f629d0774..a72ecd62eb73 100644 --- a/packages/SettingsLib/res/values-fr/strings.xml +++ b/packages/SettingsLib/res/values-fr/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Activé par l\'administrateur"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Désactivé par l\'administrateur"</string> <string name="home" msgid="3256884684164448244">"Paramètres"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0 %"</item> + <item msgid="8934126114226089439">"50 %"</item> + <item msgid="1286113608943010849">"100 %"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"Il y a <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="remaining_length_format" msgid="7886337596669190587">"Il reste <xliff:g id="ID_1">%1$s</xliff:g>."</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Petit"</string> diff --git a/packages/SettingsLib/res/values-gl-rES/strings.xml b/packages/SettingsLib/res/values-gl-rES/strings.xml index ce52a7022eb2..8fb4431c0ab4 100644 --- a/packages/SettingsLib/res/values-gl-rES/strings.xml +++ b/packages/SettingsLib/res/values-gl-rES/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Activado polo administrador"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Desactivado polo administrador"</string> <string name="home" msgid="3256884684164448244">"Inicio da configuración"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0 %"</item> + <item msgid="8934126114226089439">"50 %"</item> + <item msgid="1286113608943010849">"100 %"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"Hai <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="remaining_length_format" msgid="7886337596669190587">"Tempo restante: <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Pequeno"</string> diff --git a/packages/SettingsLib/res/values-gu-rIN/strings.xml b/packages/SettingsLib/res/values-gu-rIN/strings.xml index 13eb654acd4c..fcb396867d03 100644 --- a/packages/SettingsLib/res/values-gu-rIN/strings.xml +++ b/packages/SettingsLib/res/values-gu-rIN/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"વ્યવસ્થાપક દ્વારા સક્ષમ કરેલ"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"વ્યવસ્થાપક દ્વારા અક્ષમ કરેલ"</string> <string name="home" msgid="3256884684164448244">"સેટિંગ્સ હોમ"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> પહેલાં"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> બાકી"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"નાનું"</string> diff --git a/packages/SettingsLib/res/values-hi/strings.xml b/packages/SettingsLib/res/values-hi/strings.xml index 0ed67eeddfe0..65338cc7d555 100644 --- a/packages/SettingsLib/res/values-hi/strings.xml +++ b/packages/SettingsLib/res/values-hi/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"व्यवस्थापक द्वारा सक्षम किया गया"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"व्यवस्थापक द्वारा अक्षम किया गया"</string> <string name="home" msgid="3256884684164448244">"सेटिंग होम"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> पहले"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> शेष"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"छोटा"</string> diff --git a/packages/SettingsLib/res/values-hr/strings.xml b/packages/SettingsLib/res/values-hr/strings.xml index 6c87e802b740..974af2c1576e 100644 --- a/packages/SettingsLib/res/values-hr/strings.xml +++ b/packages/SettingsLib/res/values-hr/strings.xml @@ -282,7 +282,7 @@ <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Taj izbor više nije važeći. Pokušajte ponovo."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Pretvori u enkripciju datoteka"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Pretvori…"</string> - <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Enkripcija datoteka već je izvršena"</string> + <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Datoteke su već šifrirane"</string> <string name="title_convert_fbe" msgid="1263622876196444453">"Pretvaranje u enkripciju datoteka"</string> <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Pretvorite podatkovnu particiju u enkripciju datoteka.\n Upozorenje! Time će se izbrisati svi vaši podaci.\n Značajka je u alfa verziji i možda neće funkcionirati pravilno.\n Pritisnite \"Izbriši i pretvori...\" da biste nastavili."</string> <string name="button_convert_fbe" msgid="5152671181309826405">"Izbriši i pretvori…"</string> @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Omogućio administrator"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Onemogućio administrator"</string> <string name="home" msgid="3256884684164448244">"Početni zaslon postavki"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"Prije <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="remaining_length_format" msgid="7886337596669190587">"Još <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Malo"</string> diff --git a/packages/SettingsLib/res/values-hu/strings.xml b/packages/SettingsLib/res/values-hu/strings.xml index 5b8525cffb5c..059a8bbf95eb 100644 --- a/packages/SettingsLib/res/values-hu/strings.xml +++ b/packages/SettingsLib/res/values-hu/strings.xml @@ -226,7 +226,7 @@ <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL nyomon követése"</string> <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Hangátirányítás tiltása"</string> <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Hangátirányítás tiltása az USB-s hangeszközöknél"</string> - <string name="debug_layout" msgid="5981361776594526155">"Elrendezéshatár mutatása"</string> + <string name="debug_layout" msgid="5981361776594526155">"Elrendezéshatárok"</string> <string name="debug_layout_summary" msgid="2001775315258637682">"Kliphatárok, margók stb. megjelenítése."</string> <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Elrendezés jobbról balra"</string> <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Elrendezés jobbról balra minden nyelvnél"</string> @@ -237,7 +237,7 @@ <string name="force_msaa" msgid="7920323238677284387">"4x MSAA kényszerítése"</string> <string name="force_msaa_summary" msgid="9123553203895817537">"A 4x MSAA engedélyezése az OpenGL ES 2.0-nál"</string> <string name="show_non_rect_clip" msgid="505954950474595172">"Nem négyzetes kivágási műveletek hibakeresése"</string> - <string name="track_frame_time" msgid="6146354853663863443">"Profil GPU-renderelésről"</string> + <string name="track_frame_time" msgid="6146354853663863443">"GPU-renderelési profil"</string> <string name="window_animation_scale_title" msgid="6162587588166114700">"Ablakanimáció tempója"</string> <string name="transition_animation_scale_title" msgid="387527540523595875">"Áttűnési animáció tempója"</string> <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animáció tempója"</string> @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Engedélyezve a rendszergazda által"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Letiltva a rendszergazda által"</string> <string name="home" msgid="3256884684164448244">"Kezdőlap beállítása"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"Ennyi ideje: <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> van hátra"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Kicsi"</string> diff --git a/packages/SettingsLib/res/values-hy-rAM/strings.xml b/packages/SettingsLib/res/values-hy-rAM/strings.xml index 8db93c6d5b9a..70118de77029 100644 --- a/packages/SettingsLib/res/values-hy-rAM/strings.xml +++ b/packages/SettingsLib/res/values-hy-rAM/strings.xml @@ -139,7 +139,7 @@ <string name="choose_profile" msgid="8229363046053568878">"Ընտրել պրոֆիլ"</string> <string name="category_personal" msgid="1299663247844969448">"Անձնական"</string> <string name="category_work" msgid="8699184680584175622">"Աշխատանքային"</string> - <string name="development_settings_title" msgid="215179176067683667">"Ծրագրավորման ընտրանքներ"</string> + <string name="development_settings_title" msgid="215179176067683667">"Ծրագրավորողի ընտրանքներ"</string> <string name="development_settings_enable" msgid="542530994778109538">"Միացնել մշակողի ընտրանքները"</string> <string name="development_settings_summary" msgid="1815795401632854041">"Կարգավորել ընտրանքները ծրագրի ծրագրավորման համար"</string> <string name="development_settings_not_available" msgid="4308569041701535607">"Ծրագրավորման ընտրանքներն այլևս հասանելի չեն այս օգտվողի համար"</string> @@ -226,7 +226,7 @@ <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Ակտիվացնել OpenGL հետքերը"</string> <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Անջատել USB աուդիո երթուղայնացումը"</string> <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Անջատել ավտոմատ երթուղայնացումը դեպի USB աուդիո սարքեր"</string> - <string name="debug_layout" msgid="5981361776594526155">"Ցուցադրել կապակցումների դասավորությունը"</string> + <string name="debug_layout" msgid="5981361776594526155">"Ցույց տալ տարրերի չափսերը"</string> <string name="debug_layout_summary" msgid="2001775315258637682">"Ցույց տալ կտրվածքի սահմանները, լուսանցքները և այլն"</string> <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Փոխել RTL-ի դասավորության ուղղությունը"</string> <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Դարձնել էկրանի դասավորության ուղղությունը դեպի RTL բոլոր լեզուների համար"</string> @@ -237,7 +237,7 @@ <string name="force_msaa" msgid="7920323238677284387">"Ստիպել 4x MSAA"</string> <string name="force_msaa_summary" msgid="9123553203895817537">"Միացնել 4x MSAA-ը OpenGL ES 2.0 ծրագրերում"</string> <string name="show_non_rect_clip" msgid="505954950474595172">"Կարգաբերել ոչ-ուղղանկյուն կտրվածքի գործողությունները"</string> - <string name="track_frame_time" msgid="6146354853663863443">"GPU պրոֆիլի ցուցադրում"</string> + <string name="track_frame_time" msgid="6146354853663863443">"GPU տվյալներ"</string> <string name="window_animation_scale_title" msgid="6162587588166114700">"Պատուհանի շարժապատկերի սանդղակ"</string> <string name="transition_animation_scale_title" msgid="387527540523595875">"Անցումային շարժական սանդղակ"</string> <string name="animator_duration_scale_title" msgid="3406722410819934083">"Շարժանկարի տևողության սանդղակ"</string> @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Միացված է ադմինիստրատորի կողմից"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Կասեցված է ադմինիստրատորի կողմից"</string> <string name="home" msgid="3256884684164448244">"Կարգավորումների գլխավոր էջ"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> առաջ"</string> <string name="remaining_length_format" msgid="7886337596669190587">"Մնացել է <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Փոքր"</string> diff --git a/packages/SettingsLib/res/values-in/strings.xml b/packages/SettingsLib/res/values-in/strings.xml index e328a9308166..acbbb4c7086e 100644 --- a/packages/SettingsLib/res/values-in/strings.xml +++ b/packages/SettingsLib/res/values-in/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Diaktifkan oleh administrator"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Dinonaktifkan oleh administrator"</string> <string name="home" msgid="3256884684164448244">"Layar Utama Setelan"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> lalu"</string> <string name="remaining_length_format" msgid="7886337596669190587">"Tersisa <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Kecil"</string> diff --git a/packages/SettingsLib/res/values-is-rIS/strings.xml b/packages/SettingsLib/res/values-is-rIS/strings.xml index 3558270a96f5..4bfc0a679f09 100644 --- a/packages/SettingsLib/res/values-is-rIS/strings.xml +++ b/packages/SettingsLib/res/values-is-rIS/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Virkjað af stjórnanda"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Stjórnandi gerði óvirkt"</string> <string name="home" msgid="3256884684164448244">"Stillingar"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"Fyrir <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> eftir"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Lítið"</string> diff --git a/packages/SettingsLib/res/values-it/arrays.xml b/packages/SettingsLib/res/values-it/arrays.xml index d64ec0633ffa..be7acfcbb86d 100644 --- a/packages/SettingsLib/res/values-it/arrays.xml +++ b/packages/SettingsLib/res/values-it/arrays.xml @@ -59,7 +59,7 @@ <item msgid="45075631231212732">"Usa sempre la verifica HDCP"</item> </string-array> <string-array name="select_logd_size_titles"> - <item msgid="8665206199209698501">"Non attiva"</item> + <item msgid="8665206199209698501">"Off"</item> <item msgid="1593289376502312923">"64 kB"</item> <item msgid="487545340236145324">"256 kB"</item> <item msgid="2423528675294333831">"1 MB"</item> @@ -67,13 +67,13 @@ <item msgid="2803199102589126938">"16 MB"</item> </string-array> <string-array name="select_logd_size_lowram_titles"> - <item msgid="6089470720451068364">"Non attiva"</item> + <item msgid="6089470720451068364">"Off"</item> <item msgid="4622460333038586791">"64 kB"</item> <item msgid="2212125625169582330">"256 kB"</item> <item msgid="1704946766699242653">"1 MB"</item> </string-array> <string-array name="select_logd_size_summaries"> - <item msgid="6921048829791179331">"Non attiva"</item> + <item msgid="6921048829791179331">"Off"</item> <item msgid="2969458029344750262">"64 kB/buffer log"</item> <item msgid="1342285115665698168">"256 kB/buffer log"</item> <item msgid="1314234299552254621">"1 MB/buffer log"</item> diff --git a/packages/SettingsLib/res/values-it/strings.xml b/packages/SettingsLib/res/values-it/strings.xml index 4c998874d389..959b6614088c 100644 --- a/packages/SettingsLib/res/values-it/strings.xml +++ b/packages/SettingsLib/res/values-it/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Attivata dall\'amministratore"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Disattivata dall\'amministratore"</string> <string name="home" msgid="3256884684164448244">"Home page Impostazioni"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%%"</item> + <item msgid="8934126114226089439">"50%%"</item> + <item msgid="1286113608943010849">"100%%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> fa"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> rimanenti"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Piccolo"</string> diff --git a/packages/SettingsLib/res/values-iw/strings.xml b/packages/SettingsLib/res/values-iw/strings.xml index 7574322a9abc..44016efb8b80 100644 --- a/packages/SettingsLib/res/values-iw/strings.xml +++ b/packages/SettingsLib/res/values-iw/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"הופעל על ידי מנהל המערכת"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"הושבת על ידי מנהל המערכת"</string> <string name="home" msgid="3256884684164448244">"דף הבית של ההגדרות"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"לפני <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="remaining_length_format" msgid="7886337596669190587">"נשארו <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"קטן"</string> diff --git a/packages/SettingsLib/res/values-ja/strings.xml b/packages/SettingsLib/res/values-ja/strings.xml index b25ad19dba74..12c5e25b490b 100644 --- a/packages/SettingsLib/res/values-ja/strings.xml +++ b/packages/SettingsLib/res/values-ja/strings.xml @@ -326,6 +326,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"管理者によって有効にされています"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"管理者によって無効にされています"</string> <string name="home" msgid="3256884684164448244">"設定のホーム"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g>前"</string> <string name="remaining_length_format" msgid="7886337596669190587">"あと <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"小"</string> diff --git a/packages/SettingsLib/res/values-ka-rGE/strings.xml b/packages/SettingsLib/res/values-ka-rGE/strings.xml index 1edca1b868b3..5ac238253ba0 100644 --- a/packages/SettingsLib/res/values-ka-rGE/strings.xml +++ b/packages/SettingsLib/res/values-ka-rGE/strings.xml @@ -323,7 +323,12 @@ <string name="disabled_by_admin_summary_text" msgid="6750513964908334617">"იმართება ადმინისტრატორის მიერ"</string> <string name="enabled_by_admin" msgid="2386503803463071894">"ჩართულია ადმინისტრატორის მიერ"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"გათიშულია ადმინისტრატორის მიერ"</string> - <string name="home" msgid="3256884684164448244">"პარამეტრების მთავარი გვერდი"</string> + <string name="home" msgid="3256884684164448244">"პარამეტრების გვერდი"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"გავიდა <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="remaining_length_format" msgid="7886337596669190587">"დარჩენილია <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"პატარა"</string> diff --git a/packages/SettingsLib/res/values-kk-rKZ/strings.xml b/packages/SettingsLib/res/values-kk-rKZ/strings.xml index 51002828e4b5..ab5e338f5f98 100644 --- a/packages/SettingsLib/res/values-kk-rKZ/strings.xml +++ b/packages/SettingsLib/res/values-kk-rKZ/strings.xml @@ -226,7 +226,7 @@ <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL трейстерін қосу"</string> <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB аудио бағыттау. өшіру"</string> <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"USB перифериялық аудио құр-на автоматты бағ. өшіру"</string> - <string name="debug_layout" msgid="5981361776594526155">"Орналасу жиектерін көрсету"</string> + <string name="debug_layout" msgid="5981361776594526155">"Жиектерін көрсету"</string> <string name="debug_layout_summary" msgid="2001775315258637682">"Қию шектерін, жиектерін, т.б көрсету."</string> <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Оңнан солға орналасу бағытына реттеу"</string> <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Экранның орналасу бағытын барлық тілдер үшін оңнан солға қарату"</string> @@ -237,7 +237,7 @@ <string name="force_msaa" msgid="7920323238677284387">"4x MSAA қолдану"</string> <string name="force_msaa_summary" msgid="9123553203895817537">"4x MSAA функциясын OpenGL ES 2.0 (ашық графикалық кітапхана) қолданбаларында іске қосу"</string> <string name="show_non_rect_clip" msgid="505954950474595172">"Тіктөртбұрышты емес кесу жұмыстарын жөндеу"</string> - <string name="track_frame_time" msgid="6146354853663863443">"GPU жұмыс уақытын жазу"</string> + <string name="track_frame_time" msgid="6146354853663863443">"GPU жұмысын жазу"</string> <string name="window_animation_scale_title" msgid="6162587588166114700">"Терезе анимациясының өлшемі"</string> <string name="transition_animation_scale_title" msgid="387527540523595875">"Ауысу анимациясының өлшемі"</string> <string name="animator_duration_scale_title" msgid="3406722410819934083">"Аниматор ұзақтығының межесі"</string> @@ -313,7 +313,7 @@ <string name="battery_info_status_charging" msgid="1705179948350365604">"Зарядталуда"</string> <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Айнымалы токпен зар."</string> <string name="battery_info_status_charging_ac_short" msgid="7431401092096415502">"Зарядталуда"</string> - <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"USB арқылы зарядтау"</string> + <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"USB арқылы зарядталуда"</string> <string name="battery_info_status_charging_usb_short" msgid="6733371990319101366">"Зарядталуда"</string> <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Сымсыз зарядтау"</string> <string name="battery_info_status_charging_wireless_short" msgid="752569941028903610">"Зарядталуда"</string> @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Әкімші қосқан"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Әкімші өшірген"</string> <string name="home" msgid="3256884684164448244">"Параметрлер негізгі беті"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> бұрын"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> қалды"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Кішкентай"</string> diff --git a/packages/SettingsLib/res/values-km-rKH/strings.xml b/packages/SettingsLib/res/values-km-rKH/strings.xml index 941c01d11e59..30b7f7a35a30 100644 --- a/packages/SettingsLib/res/values-km-rKH/strings.xml +++ b/packages/SettingsLib/res/values-km-rKH/strings.xml @@ -98,7 +98,7 @@ <string name="launch_defaults_some" msgid="313159469856372621">"លំនាំដើមមួយចំនួនត្រូវបានកំណត់"</string> <string name="launch_defaults_none" msgid="4241129108140034876">"គ្មានការកំណត់លំនាំដើម"</string> <string name="tts_settings" msgid="8186971894801348327">"ការកំណត់អត្ថបទទៅជាកានិយាយ"</string> - <string name="tts_settings_title" msgid="1237820681016639683">"លទ្ធផលអត្ថបទទៅការនិយាយ"</string> + <string name="tts_settings_title" msgid="1237820681016639683">"លទ្ធផលសំឡេងអានអត្ថបទ"</string> <string name="tts_default_rate_title" msgid="6030550998379310088">"អត្រានិយាយ"</string> <string name="tts_default_rate_summary" msgid="4061815292287182801">"ល្បឿនពេលអានអត្ថបទ"</string> <string name="tts_default_pitch_title" msgid="6135942113172488671">"ឡើង-ចុះ"</string> @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"បានបើកដំណើរការដោយអ្នកគ្រប់គ្រង"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"បានបិទដំណើរការដោយអ្នកគ្រប់គ្រង"</string> <string name="home" msgid="3256884684164448244">"ទំព័រដើមនៃការកំណត់"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> មុន"</string> <string name="remaining_length_format" msgid="7886337596669190587">"នៅសល់ <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"តូច"</string> diff --git a/packages/SettingsLib/res/values-kn-rIN/strings.xml b/packages/SettingsLib/res/values-kn-rIN/strings.xml index 99fb1b2efea3..9b322c83bb1f 100644 --- a/packages/SettingsLib/res/values-kn-rIN/strings.xml +++ b/packages/SettingsLib/res/values-kn-rIN/strings.xml @@ -166,7 +166,7 @@ <string name="wifi_display_certification" msgid="8611569543791307533">"ವೈರ್ಲೆಸ್ ಪ್ರದರ್ಶನ ಪ್ರಮಾಣೀಕರಣ"</string> <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi ವೆರ್ಬೋಸ್ ಲಾಗಿಂಗ್ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string> <string name="wifi_aggressive_handover" msgid="9194078645887480917">"ಸೆಲ್ಯುಲರ್ ಹಸ್ತಾಂತರಿಸಲು ಆಕ್ರಮಣಕಾರಿ Wi‑Fi"</string> - <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Wi-Fi ರೋಮ್ ಸ್ಕ್ಯಾನ್ಗಳನ್ನು ಯಾವಾಗಲೂ ಅನುಮತಿಸಿ"</string> + <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"ವೈ-ಫೈ ರೋಮ್ ಸ್ಕ್ಯಾನ್ಗಳನ್ನು ಯಾವಾಗಲೂ ಅನುಮತಿಸಿ"</string> <string name="mobile_data_always_on" msgid="7745605759775320362">"ಸೆಲ್ಯುಲರ್ ಡೇಟಾ ಯಾವಾಗಲೂ ಸಕ್ರಿಯ"</string> <string name="bluetooth_disable_absolute_volume" msgid="2660673801947898809">"ಸಂಪೂರ್ಣ ವಾಲ್ಯೂಮ್ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string> <string name="wifi_display_certification_summary" msgid="1155182309166746973">"ವೈರ್ಲೆಸ್ ಪ್ರದರ್ಶನ ಪ್ರಮಾಣೀಕರಣಕ್ಕಾಗಿ ಆಯ್ಕೆಗಳನ್ನು ತೋರಿಸು"</string> @@ -181,7 +181,7 @@ <string name="allow_mock_location_summary" msgid="317615105156345626">"ಅಣಕು ಸ್ಥಾನಗಳನ್ನು ಅನುಮತಿಸು"</string> <string name="debug_view_attributes" msgid="6485448367803310384">"ವೀಕ್ಷಣೆ ಆಟ್ರಿಬ್ಯೂಟ್ ಪರಿಶೀಲನೆ"</string> <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"ಹೊಸ Android DHCP ಕ್ಲೈಂಟ್ ಬದಲಾಗಿ Lollipop ನಿಂದ DHCP ಕ್ಲೈಂಟ್ ಬಳಸಿ."</string> - <string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Wi-Fi ಸಕ್ರಿಯವಾಗಿರುವಾಗಲೂ, ಯಾವಾಗಲೂ ಮೊಬೈಲ್ ಡೇಟಾ ಸಕ್ರಿಯವಾಗಿರಿಸಿ (ವೇಗವಾಗಿ ನೆಟ್ವರ್ಕ್ ಬದಲಾಯಿಸಲು)."</string> + <string name="mobile_data_always_on_summary" msgid="8149773901431697910">"ವೈ-ಫೈ ಸಕ್ರಿಯವಾಗಿರುವಾಗಲೂ, ಯಾವಾಗಲೂ ಮೊಬೈಲ್ ಡೇಟಾ ಸಕ್ರಿಯವಾಗಿರಿಸಿ (ವೇಗವಾಗಿ ನೆಟ್ವರ್ಕ್ ಬದಲಾಯಿಸಲು)."</string> <string name="adb_warning_title" msgid="6234463310896563253">"USB ಡೀಬಗ್ ಮಾಡುವಿಕೆಯನ್ನು ಅನುಮತಿಸುವುದೇ?"</string> <string name="adb_warning_message" msgid="7316799925425402244">"USB ಡೀಬಗ್ ಮಾಡುವಿಕೆಯು ಅಭಿವೃದ್ಧಿ ಉದ್ದೇಶಗಳಿಗೆ ಮಾತ್ರ ಆಗಿದೆ. ನಿಮ್ಮ ಕಂಪ್ಯೂಟರ್ ಮತ್ತು ನಿಮ್ಮ ಸಾಧನದ ನಡುವೆ ಡೇಟಾವನ್ನು ನಕಲಿಸಲು, ಅಧಿಸೂಚನೆ ಇಲ್ಲದೆ ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಅಪ್ಲಿಕೇಶನ್ಗಳನ್ನು ಸ್ಥಾಪಿಸಲು ಮತ್ತು ಲಾಗ್ ಡೇಟಾ ಓದಲು ಅದನ್ನು ಬಳಸಿ."</string> <string name="adb_keys_warning_message" msgid="5659849457135841625">"ನೀವು ಹಿಂದೆ ಅಧಿಕೃತಗೊಳಿಸಿದ ಎಲ್ಲ ಕಂಪ್ಯೂಟರ್ಗಳಿಂದ USB ಡೀಬಗ್ಗೆ ಪ್ರವೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವುದೇ?"</string> @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"ನಿರ್ವಾಹಕರಿಂದ ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"ನಿರ್ವಾಹಕರಿಂದ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string> <string name="home" msgid="3256884684164448244">"ಸೆಟ್ಟಿಂಗ್ಗಳ ಮುಖಪುಟ"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> ಹಿಂದೆ"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> ಉಳಿದಿದೆ"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"ಸಣ್ಣದು"</string> diff --git a/packages/SettingsLib/res/values-ko/strings.xml b/packages/SettingsLib/res/values-ko/strings.xml index 0f48a45d6dec..dace41be6b3f 100644 --- a/packages/SettingsLib/res/values-ko/strings.xml +++ b/packages/SettingsLib/res/values-ko/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"관리자가 사용 설정함"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"관리자가 사용 중지함"</string> <string name="home" msgid="3256884684164448244">"설정 홈"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> 전"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> 남음"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"작게"</string> diff --git a/packages/SettingsLib/res/values-ky-rKG/strings.xml b/packages/SettingsLib/res/values-ky-rKG/strings.xml index 935d0b371c66..5bc08ac3b16d 100644 --- a/packages/SettingsLib/res/values-ky-rKG/strings.xml +++ b/packages/SettingsLib/res/values-ky-rKG/strings.xml @@ -226,7 +226,7 @@ <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL трейстерин иштетүү"</string> <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB аудио багыттама өчүр"</string> <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Тышкы USB аудио жабдыктарына авто багыттама өчрүү"</string> - <string name="debug_layout" msgid="5981361776594526155">"Катмардын чектерин көргөзүү"</string> + <string name="debug_layout" msgid="5981361776594526155">"Элементтрдн чектрин көрст"</string> <string name="debug_layout_summary" msgid="2001775315258637682">"Клиптин чектерин, талааларын ж.б. көргөзүү"</string> <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Солдон оңго багытына мажбурлоо"</string> <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Экрандын жайгашуу багытын бардык тилдер үчүн Оңдон-солго кылуу"</string> @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Администратор иштетип койгон"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Администратор өчүрүп койгон"</string> <string name="home" msgid="3256884684164448244">"Жөндөөлөрдүн башкы бети"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> мурун"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> калды"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Кичине"</string> diff --git a/packages/SettingsLib/res/values-lo-rLA/strings.xml b/packages/SettingsLib/res/values-lo-rLA/strings.xml index d76821412065..6e13c9f75c8d 100644 --- a/packages/SettingsLib/res/values-lo-rLA/strings.xml +++ b/packages/SettingsLib/res/values-lo-rLA/strings.xml @@ -237,7 +237,7 @@ <string name="force_msaa" msgid="7920323238677284387">"ບັງຄັບໃຊ້ 4x MSAA"</string> <string name="force_msaa_summary" msgid="9123553203895817537">"ເປິດໃຊ້ 4x MSAA ໃນແອັບຯ OpenGL ES 2.0"</string> <string name="show_non_rect_clip" msgid="505954950474595172">"ດີບັ໊ກການເຮັດວຽກຂອງຄລິບທີ່ບໍ່ແມ່ນສີ່ຫຼ່ຽມ"</string> - <string name="track_frame_time" msgid="6146354853663863443">"ການສະແດງຜົນ GPU ຕາມໂປຣໄຟລ໌"</string> + <string name="track_frame_time" msgid="6146354853663863443">"ສະແດງຜົນ GPU ຕາມໂປຣໄຟລ໌"</string> <string name="window_animation_scale_title" msgid="6162587588166114700">"ຂະໜາດອະນິເມຊັນ"</string> <string name="transition_animation_scale_title" msgid="387527540523595875">"ຂະໜາດສະລັບອະນິເມຊັນ"</string> <string name="animator_duration_scale_title" msgid="3406722410819934083">"ໄລຍະເວລາອະນິເມຊັນ"</string> @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"ຖືກເປີດໃຊ້ໂດຍຜູ້ເບິ່ງແຍງລະບົບ"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"ຖືກປິດໄວ້ໂດຍຜູ້ເບິ່ງແຍງລະບົບ"</string> <string name="home" msgid="3256884684164448244">"ໜ້າທຳອິດຂອງການຕັ້ງຄ່າ"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> ກ່ອນນີ້"</string> <string name="remaining_length_format" msgid="7886337596669190587">"ຍັງເຫຼືອ <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"ນ້ອຍ"</string> diff --git a/packages/SettingsLib/res/values-lt/strings.xml b/packages/SettingsLib/res/values-lt/strings.xml index 7318b41fef10..d409366f5cc3 100644 --- a/packages/SettingsLib/res/values-lt/strings.xml +++ b/packages/SettingsLib/res/values-lt/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Įgalino administratorius"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Išjungė administratorius"</string> <string name="home" msgid="3256884684164448244">"Pagrindinis Nustatymų ekranas"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0 %"</item> + <item msgid="8934126114226089439">"50 %"</item> + <item msgid="1286113608943010849">"100 %"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"Prieš <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="remaining_length_format" msgid="7886337596669190587">"Liko <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Mažas"</string> diff --git a/packages/SettingsLib/res/values-lv/strings.xml b/packages/SettingsLib/res/values-lv/strings.xml index e11a4b2e920f..7dfd9ac59f91 100644 --- a/packages/SettingsLib/res/values-lv/strings.xml +++ b/packages/SettingsLib/res/values-lv/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Iespējojis administrators"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Atspējojis administrators"</string> <string name="home" msgid="3256884684164448244">"Iestatījumu sākumekrāns"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"Pirms šāda laika: <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="remaining_length_format" msgid="7886337596669190587">"Atlikušais laiks: <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Mazs"</string> diff --git a/packages/SettingsLib/res/values-mk-rMK/strings.xml b/packages/SettingsLib/res/values-mk-rMK/strings.xml index f0d7e123ae47..7d6e43b6982e 100644 --- a/packages/SettingsLib/res/values-mk-rMK/strings.xml +++ b/packages/SettingsLib/res/values-mk-rMK/strings.xml @@ -319,11 +319,16 @@ <string name="battery_info_status_charging_wireless_short" msgid="752569941028903610">"Се полни"</string> <string name="battery_info_status_discharging" msgid="310932812698268588">"Не се полни"</string> <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Не се полни"</string> - <string name="battery_info_status_full" msgid="2824614753861462808">"Целосна"</string> + <string name="battery_info_status_full" msgid="2824614753861462808">"Полна"</string> <string name="disabled_by_admin_summary_text" msgid="6750513964908334617">"Контролирано од администраторот"</string> <string name="enabled_by_admin" msgid="2386503803463071894">"Овозможено од администраторот"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Оневозможено од администраторот"</string> <string name="home" msgid="3256884684164448244">"Почетна страница за поставки"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"Пред <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="remaining_length_format" msgid="7886337596669190587">"Преостанаа <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Мал"</string> diff --git a/packages/SettingsLib/res/values-ml-rIN/strings.xml b/packages/SettingsLib/res/values-ml-rIN/strings.xml index 82ef83d6f5b9..17b42e9a4054 100644 --- a/packages/SettingsLib/res/values-ml-rIN/strings.xml +++ b/packages/SettingsLib/res/values-ml-rIN/strings.xml @@ -139,10 +139,10 @@ <string name="choose_profile" msgid="8229363046053568878">"പ്രൊഫൈൽ തിരഞ്ഞെടുക്കുക"</string> <string name="category_personal" msgid="1299663247844969448">"വ്യക്തിഗതം"</string> <string name="category_work" msgid="8699184680584175622">"ഔദ്യോഗികം"</string> - <string name="development_settings_title" msgid="215179176067683667">"ഡവലപ്പർ ഓപ്ഷനുകൾ"</string> + <string name="development_settings_title" msgid="215179176067683667">"ഡെവലപ്പർ ഓപ്ഷനുകൾ"</string> <string name="development_settings_enable" msgid="542530994778109538">"ഡെവലപ്പർ ഓപ്ഷനുകൾ പ്രവർത്തനക്ഷമമാക്കുക"</string> <string name="development_settings_summary" msgid="1815795401632854041">"അപ്ലിക്കേഷൻ വികസനത്തിന് ഓപ്ഷനുകൾ സജ്ജീകരിക്കുക"</string> - <string name="development_settings_not_available" msgid="4308569041701535607">"ഈ ഉപയോക്താവിനായി ഡവലപ്പർ ഓപ്ഷനുകൾ ലഭ്യമല്ല"</string> + <string name="development_settings_not_available" msgid="4308569041701535607">"ഈ ഉപയോക്താവിനായി ഡെവലപ്പർ ഓപ്ഷനുകൾ ലഭ്യമല്ല"</string> <string name="vpn_settings_not_available" msgid="956841430176985598">"ഈ ഉപയോക്താവിനായി VPN ക്രമീകരണങ്ങൾ ലഭ്യമല്ല"</string> <string name="tethering_settings_not_available" msgid="6765770438438291012">"ഈ ഉപയോക്താവിനായി ടെതറിംഗ് ക്രമീകരണങ്ങൾ ലഭ്യമല്ല"</string> <string name="apn_settings_not_available" msgid="7873729032165324000">"ആക്സസ്സ് പോയിന്റ് നെയിം ക്രമീകരണങ്ങൾ ഈ ഉപയോക്താവിനായി ലഭ്യമല്ല"</string> @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"അഡ്മിനിസ്ട്രേറ്റർ പ്രവർത്തനക്ഷമമാക്കി"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"അഡ്മിനിസ്ട്രേറ്റർ പ്രവർത്തനരഹിതമാക്കി"</string> <string name="home" msgid="3256884684164448244">"ക്രമീകരണ ഹോം"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> മുമ്പ്"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> ശേഷിക്കുന്നു"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"ചെറുത്"</string> diff --git a/packages/SettingsLib/res/values-mn-rMN/arrays.xml b/packages/SettingsLib/res/values-mn-rMN/arrays.xml index c4bbbcbf44dd..79b9fea0949e 100644 --- a/packages/SettingsLib/res/values-mn-rMN/arrays.xml +++ b/packages/SettingsLib/res/values-mn-rMN/arrays.xml @@ -50,7 +50,7 @@ </string-array> <string-array name="hdcp_checking_titles"> <item msgid="441827799230089869">"Хэзээ ч шалгахгүй"</item> - <item msgid="6042769699089883931">"Зөвхөн DRM контентыг шалгах"</item> + <item msgid="6042769699089883931">"Зөвхөн DRM агуулгыг шалгах"</item> <item msgid="9174900380056846820">"Байнга шалгах"</item> </string-array> <string-array name="hdcp_checking_summaries"> diff --git a/packages/SettingsLib/res/values-mn-rMN/strings.xml b/packages/SettingsLib/res/values-mn-rMN/strings.xml index 07575084919d..359c041f3cca 100644 --- a/packages/SettingsLib/res/values-mn-rMN/strings.xml +++ b/packages/SettingsLib/res/values-mn-rMN/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Админ идэвхтэй болгосон"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Админ идэвхгүй болгосон"</string> <string name="home" msgid="3256884684164448244">"Тохиргооны нүүр хуудас"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> өмнө"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> үлдсэн"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Жижиг"</string> diff --git a/packages/SettingsLib/res/values-mr-rIN/strings.xml b/packages/SettingsLib/res/values-mr-rIN/strings.xml index ba020da79a57..1d5dc197c731 100644 --- a/packages/SettingsLib/res/values-mr-rIN/strings.xml +++ b/packages/SettingsLib/res/values-mr-rIN/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"प्रशासकाने सक्षम केलेले"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"प्रशासकाने अक्षम केलेले"</string> <string name="home" msgid="3256884684164448244">"सेटिंग्ज मुख्यपृष्ठ"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> पूर्वी"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> शिल्लक"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"लहान"</string> diff --git a/packages/SettingsLib/res/values-ms-rMY/strings.xml b/packages/SettingsLib/res/values-ms-rMY/strings.xml index 554b3afa942b..8809f712e951 100644 --- a/packages/SettingsLib/res/values-ms-rMY/strings.xml +++ b/packages/SettingsLib/res/values-ms-rMY/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Didayakan oleh pentadbir"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Dilumpuhkan oleh pentadbir"</string> <string name="home" msgid="3256884684164448244">"Laman Utama Tetapan"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> yang lalu"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> lagi"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Kecil"</string> diff --git a/packages/SettingsLib/res/values-my-rMM/strings.xml b/packages/SettingsLib/res/values-my-rMM/strings.xml index 1a4b6872db18..d035e1341462 100644 --- a/packages/SettingsLib/res/values-my-rMM/strings.xml +++ b/packages/SettingsLib/res/values-my-rMM/strings.xml @@ -71,7 +71,7 @@ <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"ထည့်သွင်းရန်အသုံးပြုသည်"</string> <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"အတူတွဲပါ"</string> <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"ချိတ်တွဲရန်"</string> - <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"ဖျက်သိမ်းရန်"</string> + <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"မလုပ်တော့ပါ"</string> <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"ချိတ်တွဲမှုက ချိတ်ဆက်ထားလျှင် သင်၏ အဆက်အသွယ်များ နှင့် ခေါ်ဆိုမှု မှတ်တမ်းကို ရယူခွင့် ပြုသည်။"</string> <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>နှင့် တွဲချိတ်မရပါ"</string> <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"ပင်နံပါတ် သို့မဟုတ် ဖြတ်သန်းခွင့်ကီးမမှန်ကန်သောကြောင့်<xliff:g id="DEVICE_NAME">%1$s</xliff:g>နှင့် တွဲချိတ်မရပါ။"</string> @@ -84,7 +84,7 @@ <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wi-Fi ၃ ဘား"</string> <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Wi-Fi အပြည့်ရှိ"</string> <string name="process_kernel_label" msgid="3916858646836739323">"Android စနစ်"</string> - <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"ဖယ်ရှားထားသော အပ်ပလီကေးရှင်းများ"</string> + <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"ဖယ်ရှားထားသော အက်ပ်များ"</string> <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"ဖယ်ရှားထားသော အပလီကေးရှင်းနှင့် သုံးစွဲသူများ"</string> <string name="tether_settings_title_usb" msgid="6688416425801386511">"USBမှတဆင့်ချိတ်ဆက်ခြင်း"</string> <string name="tether_settings_title_wifi" msgid="3277144155960302049">"ရွေ့လျားနိုင်သောဟော့စပေါ့"</string> @@ -165,7 +165,7 @@ <string name="debug_networking_category" msgid="7044075693643009662">"ကွန်ရက်လုပ်ငန်း"</string> <string name="wifi_display_certification" msgid="8611569543791307533">"ကြိုးမဲ့ပြသမှု အသိအမှတ်ပြုလက်မှတ်"</string> <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi Verbose မှတ်တမ်းတင်ခြင်းအား ဖွင့်မည်"</string> - <string name="wifi_aggressive_handover" msgid="9194078645887480917">"ထိရောက်သည့် Wi‑Fi မှ ဆယ်လူလာ လွှဲပြောင်းမှု"</string> + <string name="wifi_aggressive_handover" msgid="9194078645887480917">"ထိရောက်သည့် Wi‑Fi မှ ဆဲလ်လူလာ လွှဲပြောင်းမှု"</string> <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Wi‑Fi ရွမ်းရှာဖွေမှုကို အမြဲတမ်း ခွင့်ပြုမည်"</string> <string name="mobile_data_always_on" msgid="7745605759775320362">"ဆဲလ်လူလာဒေတာ အမြဲတမ်းဖွင့်ထားသည်"</string> <string name="bluetooth_disable_absolute_volume" msgid="2660673801947898809">"ပကတိ အသံနှုန်း သတ်မှတ်ချက် ပိတ်ရန်"</string> @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"စီမံခန့်ခွဲသူမှ ဖွင့်ထားသည်"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"စီမံခန့်ခွဲသူမှ ပိတ်ထားသည်"</string> <string name="home" msgid="3256884684164448244">"ဆက်တင် ပင်မစာမျက်နှာ"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"၀%"</item> + <item msgid="8934126114226089439">"၅၀%"</item> + <item msgid="1286113608943010849">"၁၀၀%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"ပြီးခဲ့သည့် <xliff:g id="ID_1">%1$s</xliff:g> က"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> ကျန်ပါသည်"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"သေး"</string> @@ -332,5 +337,5 @@ <string name="screen_zoom_summary_very_large" msgid="7108563375663670067">"ပိုကြီး"</string> <string name="screen_zoom_summary_extremely_large" msgid="7427320168263276227">"အကြီးဆုံး"</string> <string name="screen_zoom_summary_custom" msgid="5611979864124160447">"စိတ်ကြိုက် (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string> - <string name="help_feedback_label" msgid="6815040660801785649">"အကူအညီနှင့် တုံ့ပြန်ချက်"</string> + <string name="help_feedback_label" msgid="6815040660801785649">"အကူအညီနှင့် အကြံပြုချက်"</string> </resources> diff --git a/packages/SettingsLib/res/values-nb/strings.xml b/packages/SettingsLib/res/values-nb/strings.xml index fa15cd3f7c70..1c13fc3bd48d 100644 --- a/packages/SettingsLib/res/values-nb/strings.xml +++ b/packages/SettingsLib/res/values-nb/strings.xml @@ -70,7 +70,7 @@ <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Bruk til filoverføring"</string> <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Bruk for inndata"</string> <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Sammenkoble"</string> - <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"KOBLE"</string> + <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"KOBLE TIL"</string> <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Avbryt"</string> <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Med sammenkobling får den andre enheten tilgang til kontaktene og anropsloggen din når den er tilkoblet."</string> <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Kan ikke koble til <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Slått på av administratoren"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Avslått av administratoren"</string> <string name="home" msgid="3256884684164448244">"Innstillinger for startsiden"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0 %"</item> + <item msgid="8934126114226089439">"50 %"</item> + <item msgid="1286113608943010849">"100 %"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> siden"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> gjenstår"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Liten"</string> diff --git a/packages/SettingsLib/res/values-ne-rNP/strings.xml b/packages/SettingsLib/res/values-ne-rNP/strings.xml index e091138336b8..f8ba8316fe92 100644 --- a/packages/SettingsLib/res/values-ne-rNP/strings.xml +++ b/packages/SettingsLib/res/values-ne-rNP/strings.xml @@ -139,10 +139,10 @@ <string name="choose_profile" msgid="8229363046053568878">"प्रोफाइल रोज्नुहोस्"</string> <string name="category_personal" msgid="1299663247844969448">"व्यक्तिगत"</string> <string name="category_work" msgid="8699184680584175622">"काम"</string> - <string name="development_settings_title" msgid="215179176067683667">"विकासकर्ता विकल्पहरू"</string> + <string name="development_settings_title" msgid="215179176067683667">"विकासकर्ताका विकल्पहरू"</string> <string name="development_settings_enable" msgid="542530994778109538">"विकासकर्ता विकल्प सक्रिया गर्नुहोस्"</string> <string name="development_settings_summary" msgid="1815795401632854041">"अनुप्रयोग विकासको लागि विकल्पहरू सेट गर्नुहोस्"</string> - <string name="development_settings_not_available" msgid="4308569041701535607">"विकासकर्ता विकल्पहरू यस प्रयोगकर्ताका लागि उपलब्ध छैन"</string> + <string name="development_settings_not_available" msgid="4308569041701535607">"विकासकर्ताका विकल्पहरू यस प्रयोगकर्ताका लागि उपलब्ध छैन"</string> <string name="vpn_settings_not_available" msgid="956841430176985598">"VPN सेटिङ्हरू यो प्रयोगकर्ताको लागि उपलब्ध छैन"</string> <string name="tethering_settings_not_available" msgid="6765770438438291012">"कार्यक्षेत्र सीमा सेटिङ्हरू यो प्रयोगकर्ताको लागि उपलब्ध छैन"</string> <string name="apn_settings_not_available" msgid="7873729032165324000">"पहुँच बिन्दु नामको सेटिङ्हरू यो प्रयोगकर्ताको लागि उपलब्ध छैन"</string> @@ -164,15 +164,15 @@ <string name="mock_location_app_set" msgid="8966420655295102685">"नमूना स्थान अनुप्रयोग: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="debug_networking_category" msgid="7044075693643009662">"नेटवर्किङ"</string> <string name="wifi_display_certification" msgid="8611569543791307533">"ताररहित प्रदर्शन प्रमाणीकरण"</string> - <string name="wifi_verbose_logging" msgid="4203729756047242344">"वाइफाइ वर्बोज लग सक्षम पार्नुहोस्"</string> - <string name="wifi_aggressive_handover" msgid="9194078645887480917">"सेलुलर समायोजनका लागि आक्रामक वाइफाइ"</string> - <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"वाइफाइ घुम्ने स्क्यान गर्न सधैँ अनुमति दिनुहोस्"</string> + <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi-Fi वर्बोज लग सक्षम पार्नुहोस्"</string> + <string name="wifi_aggressive_handover" msgid="9194078645887480917">"सेलुलर समायोजनका लागि आक्रामक Wi-Fi"</string> + <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Wi-Fi घुम्ने स्क्यान गर्न सधैँ अनुमति दिनुहोस्"</string> <string name="mobile_data_always_on" msgid="7745605759775320362">"सेलुलर डेटा सधैं सक्रिय"</string> <string name="bluetooth_disable_absolute_volume" msgid="2660673801947898809">"निरपेक्ष आवाज असक्षम गर्नुहोस्"</string> <string name="wifi_display_certification_summary" msgid="1155182309166746973">"ताररहित प्रदर्शन प्रमाणीकरणका लागि विकल्पहरू देखाउनुहोस्"</string> - <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"वाइफाइ लग स्तर बढाउनुहोस्, वाइफाइ चयनकर्तामा प्रति SSID RSSI देखाइन्छ"</string> - <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"वाइफाइ संकेत कम हुँदा, सक्षम जब गरिन्छ, वाइफाइ सेलुलर लागि डेटा जडान सुम्पनामा बढी आक्रामक हुनेछ"</string> - <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"वाइफाइ घुम्ने स्क्यान इन्टरफेसमा रहेको डेटा यातायातको मात्रामा आधारित अनुमति दिनुहोस्/नदिनुहोस्"</string> + <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wi-Fi लग स्तर बढाउनुहोस्, Wi-Fi चयनकर्तामा प्रति SSID RSSI देखाइन्छ"</string> + <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Wi-Fi संकेत कम हुँदा, सक्षम जब गरिन्छ, Wi-Fi सेलुलर लागि डेटा जडान सुम्पनामा बढी आक्रामक हुनेछ"</string> + <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Wi-Fi घुम्ने स्क्यान इन्टरफेसमा रहेको डेटा यातायातको मात्रामा आधारित अनुमति दिनुहोस्/नदिनुहोस्"</string> <string name="select_logd_size_title" msgid="7433137108348553508">"लगर बफर आकारहरू"</string> <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"लग बफर प्रति लगर आकार चयन गर्नुहोस्"</string> <string name="select_usb_configuration_title" msgid="2649938511506971843">"USB विन्यास चयन गर्नुहोस्"</string> @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"प्रशासकद्वारा सक्षम गरिएको छ"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"प्रशासकद्वारा असक्षम गरिएको छ"</string> <string name="home" msgid="3256884684164448244">"सेटिङहरूको गृहपृष्ठ"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"०%"</item> + <item msgid="8934126114226089439">"५०%"</item> + <item msgid="1286113608943010849">"१००%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> पहिले"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> बाँकी"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"सानो"</string> diff --git a/packages/SettingsLib/res/values-nl/strings.xml b/packages/SettingsLib/res/values-nl/strings.xml index 2c2c5d065009..b080131f7cda 100644 --- a/packages/SettingsLib/res/values-nl/strings.xml +++ b/packages/SettingsLib/res/values-nl/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Ingeschakeld door beheerder"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Uitgeschakeld door beheerder"</string> <string name="home" msgid="3256884684164448244">"Startpagina voor instellingen"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> geleden"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> resterend"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Klein"</string> diff --git a/packages/SettingsLib/res/values-pa-rIN/arrays.xml b/packages/SettingsLib/res/values-pa-rIN/arrays.xml index d644da636e41..fd7eb674c1fe 100644 --- a/packages/SettingsLib/res/values-pa-rIN/arrays.xml +++ b/packages/SettingsLib/res/values-pa-rIN/arrays.xml @@ -155,7 +155,7 @@ <item msgid="5220695614993094977">"MTP (ਮੀਡੀਆ ਟ੍ਰਾਂਸਫਰ ਪ੍ਰੋਟੋਕੋਲ)"</item> <item msgid="2086000968159047375">"PTP (ਤਸਵੀਰ ਟ੍ਰਾਂਸਫਰ ਪ੍ਰੋਟੋਕੋਲ)"</item> <item msgid="7398830860950841822">"RNDIS (USB ਈਥਰਨੈਟ)"</item> - <item msgid="1718924214939774352">"ਔਡੀਓ ਸ੍ਰੋਤ"</item> + <item msgid="1718924214939774352">"ਔਡੀਓ ਸਰੋਤ"</item> <item msgid="8126315616613006284">"MIDI"</item> </string-array> </resources> diff --git a/packages/SettingsLib/res/values-pa-rIN/strings.xml b/packages/SettingsLib/res/values-pa-rIN/strings.xml index fb17b6c8a9e8..f2bb1904ff57 100644 --- a/packages/SettingsLib/res/values-pa-rIN/strings.xml +++ b/packages/SettingsLib/res/values-pa-rIN/strings.xml @@ -149,7 +149,7 @@ <string name="enable_adb" msgid="7982306934419797485">"USB ਡੀਬਗਿੰਗ"</string> <string name="enable_adb_summary" msgid="4881186971746056635">"ਡੀਬਗ ਮੋਡ ਜਦੋਂ USB ਕਨੈਕਟ ਕੀਤੀ ਜਾਏ"</string> <string name="clear_adb_keys" msgid="4038889221503122743">"USB ਡੀਬਗਿੰਗ ਅਧਿਕਾਰ ਰੱਦ ਕਰੋ"</string> - <string name="bugreport_in_power" msgid="7923901846375587241">"ਬਗ ਰਿਪੋਰਟ ਸ਼ੌਰਟਕਟ"</string> + <string name="bugreport_in_power" msgid="7923901846375587241">"ਬਗ ਰਿਪੋਰਟ ਸ਼ਾਰਟਕੱਟ"</string> <string name="bugreport_in_power_summary" msgid="1778455732762984579">"ਇੱਕ ਬਗ ਰਿਪੋਰਟ ਲੈਣ ਲਈ ਪਾਵਰ ਮੀਨੂ ਵਿੱਚ ਇੱਕ ਬਟਨ ਦਿਖਾਓ"</string> <string name="keep_screen_on" msgid="1146389631208760344">"ਸਕਿਰਿਆ ਰੱਖੋ"</string> <string name="keep_screen_on_summary" msgid="2173114350754293009">"ਸਕ੍ਰੀਨ ਚਾਰਜਿੰਗ ਦੇ ਸਮੇਂ ਕਦੇ ਵੀ ਸਲੀਪ ਨਹੀਂ ਹੋਵੇਗੀ"</string> @@ -168,7 +168,7 @@ <string name="wifi_aggressive_handover" msgid="9194078645887480917">"ਸੈਲਿਊਲਰ ਹੈਂਡਓਵਰ ਲਈ ਅਗਰੈਸਿਵ Wi‑Fi"</string> <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"ਹਮੇਸ਼ਾਂ Wi‑Fi Roam Scans ਦੀ ਆਗਿਆ ਦਿਓ"</string> <string name="mobile_data_always_on" msgid="7745605759775320362">"ਸੈਲਿਊਲਰ ਡੇਟਾ ਹਮੇਸ਼ਾ ਕਿਰਿਆਸ਼ੀਲ"</string> - <string name="bluetooth_disable_absolute_volume" msgid="2660673801947898809">"ਪੂਰਨ ਵੌਲਯੂਮ ਨੂੰ ਅਯੋਗ ਬਣਾਓ"</string> + <string name="bluetooth_disable_absolute_volume" msgid="2660673801947898809">"ਪੂਰਨ ਵੌਲਿਊਮ ਨੂੰ ਅਯੋਗ ਬਣਾਓ"</string> <string name="wifi_display_certification_summary" msgid="1155182309166746973">"ਵਾਇਰਲੈਸ ਡਿਸਪਲੇ ਪ੍ਰਮਾਣੀਕਰਨ ਲਈ ਚੋਣਾਂ ਦਿਖਾਓ"</string> <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Wi‑Fi ਲੌਗਿੰਗ ਪੱਧਰ ਵਧਾਓ, Wi‑Fi Picker ਵਿੱਚ ਪ੍ਰਤੀ SSID RSSI ਦਿਖਾਓ"</string> <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"ਜਦੋਂ ਸਮਰਥਿਤ ਹੋਵੇ, ਤਾਂ Wi‑Fi ਸੈਲਿਊਲਰ ਨੂੰ ਡੈਟਾ ਕਨੈਕਸ਼ਨ ਹੈਂਡ ਓਵਰ ਕਰਨ ਵਿੱਚ ਵੱਧ ਅਗ੍ਰੈਸਿਵ ਹੋ ਜਾਏਗਾ, ਜਦੋਂ Wi‑Fi ਸਿਗਨਲ ਘੱਟ ਹੋਵੇ"</string> @@ -189,7 +189,7 @@ <string name="dev_settings_warning_message" msgid="2298337781139097964">"ਇਹ ਸੈਟਿੰਗਾਂ ਕੇਵਲ ਵਿਕਾਸਕਾਰ ਦੀ ਵਰਤੋਂ ਲਈ ਹਨ। ਇਹ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਅਤੇ ਇਸਤੇ ਮੌਜੂਦ ਐਪਲੀਕੇਸ਼ਨ ਨੂੰ ਬ੍ਰੇਕ ਕਰਨ ਜਾਂ ਦੁਰਵਿਵਹਾਰ ਕਰਨ ਦਾ ਕਾਰਨ ਬਣ ਸਕਦੇ ਹਨ।"</string> <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"USB ਤੇ ਐਪਸ ਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰੋ"</string> <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"ਹਾਨੀਕਾਰਕ ਵਿਵਹਾਰ ਲਈ ADB/ADT ਰਾਹੀਂ ਇੰਸਟੌਲ ਕੀਤੇ ਐਪਸ ਦੀ ਜਾਂਚ ਕਰੋ।"</string> - <string name="bluetooth_disable_absolute_volume_summary" msgid="6031284410786545957">"ਰਿਮੋਟ ਡੀਵਾਈਸਾਂ ਨਾਲ ਵੌਲਯੂਮ ਸਮੱਸਿਆਵਾਂ ਜਿਵੇਂ ਕਿ ਨਾ ਪਸੰਦ ਕੀਤੀ ਜਾਣ ਵਾਲੀ ਉੱਚੀ ਵੌਲਯੂਮ ਜਾਂ ਕੰਟਰੋਲ ਦੀ ਕਮੀ ਵਰਗੀ ਹਾਲਤ ਵਿੱਚ ਬਲੂਟੁੱਥ ਪੂਰਨ ਵੌਲਯੂਮ ਵਿਸ਼ੇਸ਼ਤਾ ਨੂੰ ਅਯੋਗ ਬਣਾਉਂਦਾ ਹੈ।"</string> + <string name="bluetooth_disable_absolute_volume_summary" msgid="6031284410786545957">"ਰਿਮੋਟ ਡੀਵਾਈਸਾਂ ਨਾਲ ਵੌਲਿਊਮ ਸਮੱਸਿਆਵਾਂ ਜਿਵੇਂ ਕਿ ਨਾ ਪਸੰਦ ਕੀਤੀ ਜਾਣ ਵਾਲੀ ਉੱਚੀ ਵੌਲਿਊਮ ਜਾਂ ਕੰਟਰੋਲ ਦੀ ਕਮੀ ਵਰਗੀ ਹਾਲਤ ਵਿੱਚ ਬਲੂਟੁੱਥ ਪੂਰਨ ਵੌਲਿਊਮ ਵਿਸ਼ੇਸ਼ਤਾ ਨੂੰ ਅਯੋਗ ਬਣਾਉਂਦਾ ਹੈ।"</string> <string name="enable_terminal_title" msgid="95572094356054120">"ਸਥਾਨਕ ਟਰਮੀਨਲ"</string> <string name="enable_terminal_summary" msgid="67667852659359206">"ਟਰਮੀਨਲ ਐਪ ਨੂੰ ਸਮਰੱਥ ਬਣਾਓ ਜੋ ਸਥਾਨਕ ਸ਼ੈਲ ਪਹੁੰਚ ਆੱਫਰ ਕਰਦਾ ਹੈ"</string> <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP ਜਾਂਚ"</string> @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"ਪ੍ਰਸ਼ਾਸਕ ਵੱਲੋਂ ਯੋਗ ਬਣਾਈ ਗਈ"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"ਪ੍ਰਸ਼ਾਸਕ ਵੱਲੋਂ ਅਯੋਗ ਬਣਾਈ ਗਈ"</string> <string name="home" msgid="3256884684164448244">"ਸੈਟਿੰਗਾਂ ਮੁੱਖ ਪੰਨਾ"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> ਪਹਿਲਾਂ"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> ਬਾਕੀ"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"ਛੋਟਾ"</string> diff --git a/packages/SettingsLib/res/values-pl/strings.xml b/packages/SettingsLib/res/values-pl/strings.xml index e0c51f1b3e50..c72f0c6f76da 100644 --- a/packages/SettingsLib/res/values-pl/strings.xml +++ b/packages/SettingsLib/res/values-pl/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Włączone przez administratora"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Wyłączone przez administratora"</string> <string name="home" msgid="3256884684164448244">"Ekran główny ustawień"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> temu"</string> <string name="remaining_length_format" msgid="7886337596669190587">"Pozostało <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Mały"</string> diff --git a/packages/SettingsLib/res/values-pt-rBR/strings.xml b/packages/SettingsLib/res/values-pt-rBR/strings.xml index b2ca4370516d..d01ddb7a7d29 100644 --- a/packages/SettingsLib/res/values-pt-rBR/strings.xml +++ b/packages/SettingsLib/res/values-pt-rBR/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Ativada pelo administrador"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Desativada pelo administrador"</string> <string name="home" msgid="3256884684164448244">"Página inicial das configurações"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> atrás"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> restante(s)"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Pequena"</string> diff --git a/packages/SettingsLib/res/values-pt-rPT/strings.xml b/packages/SettingsLib/res/values-pt-rPT/strings.xml index 55e4def58038..8e05d8c75db2 100644 --- a/packages/SettingsLib/res/values-pt-rPT/strings.xml +++ b/packages/SettingsLib/res/values-pt-rPT/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Ativado pelo administrador"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Desativado pelo administrador"</string> <string name="home" msgid="3256884684164448244">"Página inicial de definições"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"Há <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="remaining_length_format" msgid="7886337596669190587">"Resta(m) <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Pequeno"</string> diff --git a/packages/SettingsLib/res/values-pt/strings.xml b/packages/SettingsLib/res/values-pt/strings.xml index b2ca4370516d..d01ddb7a7d29 100644 --- a/packages/SettingsLib/res/values-pt/strings.xml +++ b/packages/SettingsLib/res/values-pt/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Ativada pelo administrador"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Desativada pelo administrador"</string> <string name="home" msgid="3256884684164448244">"Página inicial das configurações"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> atrás"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> restante(s)"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Pequena"</string> diff --git a/packages/SettingsLib/res/values-ro/strings.xml b/packages/SettingsLib/res/values-ro/strings.xml index 58db725a54fb..c8587efbc8dc 100644 --- a/packages/SettingsLib/res/values-ro/strings.xml +++ b/packages/SettingsLib/res/values-ro/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Activată de administrator"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Dezactivată de administrator"</string> <string name="home" msgid="3256884684164448244">"Ecran principal Setări"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"Acum <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="remaining_length_format" msgid="7886337596669190587">"Timp rămas: <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Mic"</string> diff --git a/packages/SettingsLib/res/values-ru/strings.xml b/packages/SettingsLib/res/values-ru/strings.xml index 339d2b065f04..5721a8de7194 100644 --- a/packages/SettingsLib/res/values-ru/strings.xml +++ b/packages/SettingsLib/res/values-ru/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Включено администратором"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Отключено администратором"</string> <string name="home" msgid="3256884684164448244">"Настройки"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> назад"</string> <string name="remaining_length_format" msgid="7886337596669190587">"Осталось <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Мелкий"</string> diff --git a/packages/SettingsLib/res/values-si-rLK/strings.xml b/packages/SettingsLib/res/values-si-rLK/strings.xml index 30e7b81999aa..0087352a2931 100644 --- a/packages/SettingsLib/res/values-si-rLK/strings.xml +++ b/packages/SettingsLib/res/values-si-rLK/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"පරිපාලක විසින් සබල කරන ලදී"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"පරිපාලක විසින් අබල කරන ලදී"</string> <string name="home" msgid="3256884684164448244">"සැකසීම් මුල් පිටුව"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g>කට පෙර"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g>ක් ඉතිරිය"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"කුඩා"</string> diff --git a/packages/SettingsLib/res/values-sk/strings.xml b/packages/SettingsLib/res/values-sk/strings.xml index 5ad82d62dbeb..a791a1e99890 100644 --- a/packages/SettingsLib/res/values-sk/strings.xml +++ b/packages/SettingsLib/res/values-sk/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Povolené správcom"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Zakázané správcom"</string> <string name="home" msgid="3256884684164448244">"Domovská stránka nastavení"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0 %"</item> + <item msgid="8934126114226089439">"50 %"</item> + <item msgid="1286113608943010849">"100 %"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"pred <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="remaining_length_format" msgid="7886337596669190587">"Zostáva <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Malé"</string> diff --git a/packages/SettingsLib/res/values-sl/strings.xml b/packages/SettingsLib/res/values-sl/strings.xml index 4f003602508e..25972d0df2ce 100644 --- a/packages/SettingsLib/res/values-sl/strings.xml +++ b/packages/SettingsLib/res/values-sl/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Omogočil skrbnik"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Onemogočil skrbnik"</string> <string name="home" msgid="3256884684164448244">"Začetna stran nastavitev"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0 %"</item> + <item msgid="8934126114226089439">"50 %"</item> + <item msgid="1286113608943010849">"100 %"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"Pred toliko časa: <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="remaining_length_format" msgid="7886337596669190587">"Še <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Majhno"</string> diff --git a/packages/SettingsLib/res/values-sq-rAL/strings.xml b/packages/SettingsLib/res/values-sq-rAL/strings.xml index 753d7e39b8f5..4ab5025a83f7 100644 --- a/packages/SettingsLib/res/values-sq-rAL/strings.xml +++ b/packages/SettingsLib/res/values-sq-rAL/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Aktivizuar nga administratori"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Çaktivizuar nga administratori"</string> <string name="home" msgid="3256884684164448244">"Kreu i cilësimeve"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> më parë"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> të mbetura"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"I vogël"</string> diff --git a/packages/SettingsLib/res/values-sr/strings.xml b/packages/SettingsLib/res/values-sr/strings.xml index 2fee5672ce40..9858580f439e 100644 --- a/packages/SettingsLib/res/values-sr/strings.xml +++ b/packages/SettingsLib/res/values-sr/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Омогућио је администратор"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Онемогућио је администратор"</string> <string name="home" msgid="3256884684164448244">"Почетна за Подешавања"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"Пре <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="remaining_length_format" msgid="7886337596669190587">"Још <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Мали"</string> diff --git a/packages/SettingsLib/res/values-sv/strings.xml b/packages/SettingsLib/res/values-sv/strings.xml index 60704e0dbcf4..45b1b6cc7bf2 100644 --- a/packages/SettingsLib/res/values-sv/strings.xml +++ b/packages/SettingsLib/res/values-sv/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Har aktiverats av administratören"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Har inaktiverats av administratören"</string> <string name="home" msgid="3256884684164448244">"Startskärmen för inställningar"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0 %"</item> + <item msgid="8934126114226089439">"50 %"</item> + <item msgid="1286113608943010849">"100 %"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"för <xliff:g id="ID_1">%1$s</xliff:g> sedan"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> kvar"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Små"</string> diff --git a/packages/SettingsLib/res/values-sw/strings.xml b/packages/SettingsLib/res/values-sw/strings.xml index 245cabae1b88..89545f90b108 100644 --- a/packages/SettingsLib/res/values-sw/strings.xml +++ b/packages/SettingsLib/res/values-sw/strings.xml @@ -294,7 +294,7 @@ <string name="daltonizer_mode_protanomaly" msgid="8424148009038666065">"Protanomaly (nyekundu-kijani)"</string> <string name="daltonizer_mode_tritanomaly" msgid="481725854987912389">"Tritanomaly (samawati-manjano)"</string> <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Usahihishaji wa rangi"</string> - <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Kipengele hiki ni cha majaribio na huenda kikaathiri utendaji."</string> + <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Kipengele hiki ni cha majaribio na huenda kikaathiri utendaji wa kifaa chako."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Imetanguliwa na <xliff:g id="TITLE">%1$s</xliff:g>"</string> <string name="power_remaining_duration_only" msgid="4400068916452346544">"Zimesalia takribani <xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="power_remaining_duration_only_short" msgid="5329694252258605547">"Zimesalia <xliff:g id="TIME">%1$s</xliff:g>"</string> @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Msimamizi amewasha mapendeleo ya mipangilio"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Msimamizi amezima mapendeleo ya mipangilio"</string> <string name="home" msgid="3256884684164448244">"Ukurasa wa Kwanza wa Mipangilio"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"Zimepita <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="remaining_length_format" msgid="7886337596669190587">"Zimesalia <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Ndogo"</string> diff --git a/packages/SettingsLib/res/values-ta-rIN/strings.xml b/packages/SettingsLib/res/values-ta-rIN/strings.xml index cdd95cf76d7e..bfa36c3a9730 100644 --- a/packages/SettingsLib/res/values-ta-rIN/strings.xml +++ b/packages/SettingsLib/res/values-ta-rIN/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"நிர்வாகி இயக்கியுள்ளார்"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"நிர்வாகி முடக்கியுள்ளார்"</string> <string name="home" msgid="3256884684164448244">"அமைப்புகள் முகப்பு"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> முன்"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> உள்ளது"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"சிறியது"</string> diff --git a/packages/SettingsLib/res/values-te-rIN/strings.xml b/packages/SettingsLib/res/values-te-rIN/strings.xml index 0c43480decab..5a7a7ae0734f 100644 --- a/packages/SettingsLib/res/values-te-rIN/strings.xml +++ b/packages/SettingsLib/res/values-te-rIN/strings.xml @@ -226,7 +226,7 @@ <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL ట్రేస్లను ప్రారంభించండి"</string> <string name="usb_audio_disable_routing" msgid="8114498436003102671">"USB ఆడియో రూటిం. నిలిపి."</string> <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"USB ఆడియో పరికరాలకు స్వయం. రూటింగ్ను నిలిపివేయండి"</string> - <string name="debug_layout" msgid="5981361776594526155">"లేఅవుట్ బౌండ్లను చూపండి"</string> + <string name="debug_layout" msgid="5981361776594526155">"లేఅవుట్ బౌండ్లు చూపు"</string> <string name="debug_layout_summary" msgid="2001775315258637682">"క్లిప్ సరిహద్దులు, అంచులు మొ. చూపు"</string> <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"RTL లేఅవుట్ దిశను నిర్భందం చేయండి"</string> <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"అన్ని లొకేల్ల కోసం RTLకి స్క్రీన్ లేఅవుట్ దిశను నిర్భందించు"</string> @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"నిర్వాహకులు ప్రారంభించారు"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"నిర్వాహకులు నిలిపివేసారు"</string> <string name="home" msgid="3256884684164448244">"సెట్టింగ్ల హోమ్"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> క్రితం"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> మిగిలి ఉంది"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"చిన్నగా"</string> diff --git a/packages/SettingsLib/res/values-th/strings.xml b/packages/SettingsLib/res/values-th/strings.xml index 7d2c9fba55e4..d7fe2b643c94 100644 --- a/packages/SettingsLib/res/values-th/strings.xml +++ b/packages/SettingsLib/res/values-th/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"เปิดใช้โดยผู้ดูแลระบบ"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"ปิดใช้โดยผู้ดูแลระบบ"</string> <string name="home" msgid="3256884684164448244">"หน้าแรกของการตั้งค่า"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g>ที่ผ่านมา"</string> <string name="remaining_length_format" msgid="7886337596669190587">"เหลือ <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"เล็ก"</string> diff --git a/packages/SettingsLib/res/values-tl/strings.xml b/packages/SettingsLib/res/values-tl/strings.xml index 4c12a7df3744..08dbb014b9d5 100644 --- a/packages/SettingsLib/res/values-tl/strings.xml +++ b/packages/SettingsLib/res/values-tl/strings.xml @@ -226,7 +226,7 @@ <string name="enable_opengl_traces_title" msgid="6790444011053219871">"I-enable ang OpenGL traces"</string> <string name="usb_audio_disable_routing" msgid="8114498436003102671">"I-disable USB audio routing"</string> <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"I-disable automatic routing sa USB audio peripheral"</string> - <string name="debug_layout" msgid="5981361776594526155">"Ipakita mga layout bound"</string> + <string name="debug_layout" msgid="5981361776594526155">"Ipakita ang layout bounds"</string> <string name="debug_layout_summary" msgid="2001775315258637682">"Ipakita ang mga hangganan ng clip, margin, atbp."</string> <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Force RTL layout dir."</string> <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Force screen layout dir. sa RTL sa lahat ng lokal"</string> @@ -237,7 +237,7 @@ <string name="force_msaa" msgid="7920323238677284387">"Puwersahin ang 4x MSAA"</string> <string name="force_msaa_summary" msgid="9123553203895817537">"Paganahin ang 4x MSAA sa OpenGL ES 2.0 na apps"</string> <string name="show_non_rect_clip" msgid="505954950474595172">"I-debug ang di-parihabang mga clip operation"</string> - <string name="track_frame_time" msgid="6146354853663863443">"Pag-render GPU ng Profile"</string> + <string name="track_frame_time" msgid="6146354853663863443">"Pag-render ng Profile GPU"</string> <string name="window_animation_scale_title" msgid="6162587588166114700">"Scale ng window animation"</string> <string name="transition_animation_scale_title" msgid="387527540523595875">"Scale ng transition animation"</string> <string name="animator_duration_scale_title" msgid="3406722410819934083">"Scale ng tagal ng animator"</string> @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Na-enable ng administrator"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Na-disable ng administrator"</string> <string name="home" msgid="3256884684164448244">"Home ng Mga Setting"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> na ang nakalipas"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> na lang"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Maliit"</string> diff --git a/packages/SettingsLib/res/values-tr/strings.xml b/packages/SettingsLib/res/values-tr/strings.xml index de8222be343f..ceb1292ba625 100644 --- a/packages/SettingsLib/res/values-tr/strings.xml +++ b/packages/SettingsLib/res/values-tr/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Yönetici tarafından etkinleştirildi"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Yönetici tarafından devre dışı bırakıldı"</string> <string name="home" msgid="3256884684164448244">"Ayarlar Ana Sayfası"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"%0"</item> + <item msgid="8934126114226089439">"%50"</item> + <item msgid="1286113608943010849">"%100"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> önce"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> kaldı"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Küçük"</string> diff --git a/packages/SettingsLib/res/values-uk/strings.xml b/packages/SettingsLib/res/values-uk/strings.xml index e09ef5985959..44c9be785352 100644 --- a/packages/SettingsLib/res/values-uk/strings.xml +++ b/packages/SettingsLib/res/values-uk/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Увімкнено адміністратором"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Вимкнено адміністратором"</string> <string name="home" msgid="3256884684164448244">"Головний екран налаштувань"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> тому"</string> <string name="remaining_length_format" msgid="7886337596669190587">"Залишилося <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Малі елементи"</string> diff --git a/packages/SettingsLib/res/values-ur-rPK/strings.xml b/packages/SettingsLib/res/values-ur-rPK/strings.xml index c6b6d8081381..6490204c45e9 100644 --- a/packages/SettingsLib/res/values-ur-rPK/strings.xml +++ b/packages/SettingsLib/res/values-ur-rPK/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"منتظم نے فعال کر دیا"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"منتظم نے غیر فعال کر دیا"</string> <string name="home" msgid="3256884684164448244">"ترتیبات ہوم"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> قبل"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> باقی ہیں"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"چھوٹا"</string> diff --git a/packages/SettingsLib/res/values-uz-rUZ/strings.xml b/packages/SettingsLib/res/values-uz-rUZ/strings.xml index dc103397cd3c..13fdb05cc2d1 100644 --- a/packages/SettingsLib/res/values-uz-rUZ/strings.xml +++ b/packages/SettingsLib/res/values-uz-rUZ/strings.xml @@ -114,7 +114,7 @@ <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ushbu nutq sintezi mexanizmi barcha yozgan matnlaringizni to‘plab olishi mumkin, jumladan kredit karta raqamlari va parollar kabi shaxsiy ma‘lumotlarni ham. U <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> mexanizmi bilan o‘rnatiladi. Ushbu nutq sintezi mexanizmidan foydalanilsinmi?"</string> <string name="tts_engine_network_required" msgid="1190837151485314743">"Bu til uchun nutq sintezatorini yoqish uchun Internetga ulaning."</string> <string name="tts_default_sample_string" msgid="4040835213373086322">"Bu nutq sintezining misoli"</string> - <string name="tts_status_title" msgid="7268566550242584413">"Birlamchi til"</string> + <string name="tts_status_title" msgid="7268566550242584413">"Asosiy til"</string> <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> – to‘liq qo‘llab-quvvatlanadi"</string> <string name="tts_status_requires_network" msgid="6042500821503226892">"<xliff:g id="LOCALE">%1$s</xliff:g> tili tarmoqqa ulanishi lozim"</string> <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> – qo‘llab-quvvatlanmaydi"</string> @@ -152,7 +152,7 @@ <string name="bugreport_in_power" msgid="7923901846375587241">"Xatoliklar hisoboti"</string> <string name="bugreport_in_power_summary" msgid="1778455732762984579">"Menyuda xatoliklar hisobotini yuborish tugmasi ko‘rsatilsin"</string> <string name="keep_screen_on" msgid="1146389631208760344">"Ekranning yoniq turishi"</string> - <string name="keep_screen_on_summary" msgid="2173114350754293009">"Qurilmani quvvatlash vaqtida ekran doim yoniq turadi"</string> + <string name="keep_screen_on_summary" msgid="2173114350754293009">"Qurilma quvvat olayotganda ekran doim yoniq turadi"</string> <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI amallari translatsiyasi jurnali"</string> <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Barcha Bluetooth HCI paketlarini bitta faylga saqlash"</string> <string name="oem_unlock_enable" msgid="6040763321967327691">"Zavod qulfini yechish"</string> @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Administrator tomonidan yoqilgan"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Administrator tomonidan o‘chirilgan"</string> <string name="home" msgid="3256884684164448244">"Sozlamalar"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> oldin"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> qoldi"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Kichkina"</string> diff --git a/packages/SettingsLib/res/values-vi/strings.xml b/packages/SettingsLib/res/values-vi/strings.xml index 975aa58147b3..c6b47fdf1d04 100644 --- a/packages/SettingsLib/res/values-vi/strings.xml +++ b/packages/SettingsLib/res/values-vi/strings.xml @@ -98,7 +98,7 @@ <string name="launch_defaults_some" msgid="313159469856372621">"Đã đặt một số ứng dụng chạy mặc định"</string> <string name="launch_defaults_none" msgid="4241129108140034876">"Chưa đặt mặc định"</string> <string name="tts_settings" msgid="8186971894801348327">"Cài đặt chuyển văn bản thành giọng nói"</string> - <string name="tts_settings_title" msgid="1237820681016639683">"Đầu ra v.bản thành giọng nói"</string> + <string name="tts_settings_title" msgid="1237820681016639683">"Đầu ra văn bản thành giọng nói"</string> <string name="tts_default_rate_title" msgid="6030550998379310088">"Tốc độ nói"</string> <string name="tts_default_rate_summary" msgid="4061815292287182801">"Tốc độ đọc văn bản"</string> <string name="tts_default_pitch_title" msgid="6135942113172488671">"Độ cao"</string> @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Được bật bởi quản trị viên"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Bị tắt bởi quản trị viên"</string> <string name="home" msgid="3256884684164448244">"Trang chủ cài đặt"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> trước"</string> <string name="remaining_length_format" msgid="7886337596669190587">"Còn <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Nhỏ"</string> diff --git a/packages/SettingsLib/res/values-zh-rCN/strings.xml b/packages/SettingsLib/res/values-zh-rCN/strings.xml index b81c995c60e4..6b4c453764a0 100644 --- a/packages/SettingsLib/res/values-zh-rCN/strings.xml +++ b/packages/SettingsLib/res/values-zh-rCN/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"已被管理员启用"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"已被管理员禁用"</string> <string name="home" msgid="3256884684164448244">"设置主屏幕"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g>前"</string> <string name="remaining_length_format" msgid="7886337596669190587">"还剩 <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"小"</string> diff --git a/packages/SettingsLib/res/values-zh-rHK/strings.xml b/packages/SettingsLib/res/values-zh-rHK/strings.xml index 3388c27fbf63..c8cb2d981b03 100644 --- a/packages/SettingsLib/res/values-zh-rHK/strings.xml +++ b/packages/SettingsLib/res/values-zh-rHK/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"已由管理員啟用"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"已由管理員停用"</string> <string name="home" msgid="3256884684164448244">"主設定畫面"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g>前"</string> <string name="remaining_length_format" msgid="7886337596669190587">"尚餘 <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"小"</string> diff --git a/packages/SettingsLib/res/values-zh-rTW/strings.xml b/packages/SettingsLib/res/values-zh-rTW/strings.xml index 437e8995726b..75f975899336 100644 --- a/packages/SettingsLib/res/values-zh-rTW/strings.xml +++ b/packages/SettingsLib/res/values-zh-rTW/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"已由管理員啟用"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"已由管理員停用"</string> <string name="home" msgid="3256884684164448244">"設定主畫面"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g>前"</string> <string name="remaining_length_format" msgid="7886337596669190587">"還剩 <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"小"</string> diff --git a/packages/SettingsLib/res/values-zu/strings.xml b/packages/SettingsLib/res/values-zu/strings.xml index aa8ae4260427..1217183f7523 100644 --- a/packages/SettingsLib/res/values-zu/strings.xml +++ b/packages/SettingsLib/res/values-zu/strings.xml @@ -324,6 +324,11 @@ <string name="enabled_by_admin" msgid="2386503803463071894">"Kunikwe amandla umqondisi"</string> <string name="disabled_by_admin" msgid="3669999613095206948">"Ikhutshazwe umlawuli"</string> <string name="home" msgid="3256884684164448244">"Ikhaya lezilungiselelo"</string> + <string-array name="battery_labels"> + <item msgid="8494684293649631252">"0%"</item> + <item msgid="8934126114226089439">"50%"</item> + <item msgid="1286113608943010849">"100%"</item> + </string-array> <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> edlule"</string> <string name="remaining_length_format" msgid="7886337596669190587">"<xliff:g id="ID_1">%1$s</xliff:g> osele"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Okuncane"</string> diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java index 8e43bffbbfdc..6bd8a879dabb 100644 --- a/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java +++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java @@ -616,11 +616,12 @@ public class RestrictedLockUtils { */ public static void sendShowAdminSupportDetailsIntent(Context context, EnforcedAdmin admin) { final Intent intent = getShowAdminSupportDetailsIntent(context, admin); - int adminUserId = UserHandle.myUserId(); - if (admin.userId != UserHandle.USER_NULL) { - adminUserId = admin.userId; + int targetUserId = UserHandle.myUserId(); + if (admin != null && admin.userId != UserHandle.USER_NULL + && isCurrentUserOrProfile(context, admin.userId)) { + targetUserId = admin.userId; } - context.startActivityAsUser(intent, new UserHandle(adminUserId)); + context.startActivityAsUser(intent, new UserHandle(targetUserId)); } public static Intent getShowAdminSupportDetailsIntent(Context context, EnforcedAdmin admin) { @@ -638,6 +639,28 @@ public class RestrictedLockUtils { return intent; } + public static boolean isCurrentUserOrProfile(Context context, int userId) { + UserManager um = UserManager.get(context); + for (UserInfo userInfo : um.getProfiles(UserHandle.myUserId())) { + if (userInfo.id == userId) { + return true; + } + } + return false; + } + + public static boolean isAdminInCurrentUserOrProfile(Context context, ComponentName admin) { + DevicePolicyManager dpm = (DevicePolicyManager) context.getSystemService( + Context.DEVICE_POLICY_SERVICE); + UserManager um = UserManager.get(context); + for (UserInfo userInfo : um.getProfiles(UserHandle.myUserId())) { + if (dpm.isAdminActiveAsUser(admin, userInfo.id)) { + return true; + } + } + return false; + } + public static void setTextViewPadlock(Context context, TextView textView, boolean showPadlock) { final SpannableStringBuilder sb = new SpannableStringBuilder(textView.getText()); @@ -701,8 +724,8 @@ public class RestrictedLockUtils { if (userId != other.userId) { return false; } - if ((component == null && other == null) || - (component != null && component.equals(other))) { + if ((component == null && other.component == null) || + (component != null && component.equals(other.component))) { return true; } return false; diff --git a/packages/SettingsProvider/res/values-be-rBY/strings.xml b/packages/SettingsProvider/res/values-be-rBY/strings.xml index c164ac7b22d8..3a8557ce9a32 100644 --- a/packages/SettingsProvider/res/values-be-rBY/strings.xml +++ b/packages/SettingsProvider/res/values-be-rBY/strings.xml @@ -19,5 +19,5 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_label" msgid="4567566098528588863">"Захоўванне налад"</string> + <string name="app_label" msgid="4567566098528588863">"Сховішча налад"</string> </resources> diff --git a/packages/SystemUI/res/anim/tv_pip_controls_text_focus_gain_animation.xml b/packages/SystemUI/res/anim/tv_pip_controls_focus_gain_animation.xml index 257bf35c8e76..257bf35c8e76 100644 --- a/packages/SystemUI/res/anim/tv_pip_controls_text_focus_gain_animation.xml +++ b/packages/SystemUI/res/anim/tv_pip_controls_focus_gain_animation.xml diff --git a/packages/SystemUI/res/anim/tv_pip_controls_text_focus_lose_animation.xml b/packages/SystemUI/res/anim/tv_pip_controls_focus_loss_animation.xml index e032008b3750..e032008b3750 100644 --- a/packages/SystemUI/res/anim/tv_pip_controls_text_focus_lose_animation.xml +++ b/packages/SystemUI/res/anim/tv_pip_controls_focus_loss_animation.xml diff --git a/packages/SystemUI/res/anim/tv_pip_controls_in_recents_focus_lose_animation.xml b/packages/SystemUI/res/anim/tv_pip_controls_in_recents_focus_loss_animation.xml index b571aa569f0d..b571aa569f0d 100644 --- a/packages/SystemUI/res/anim/tv_pip_controls_in_recents_focus_lose_animation.xml +++ b/packages/SystemUI/res/anim/tv_pip_controls_in_recents_focus_loss_animation.xml diff --git a/packages/SystemUI/res/drawable/ic_hotspot_unavailable.xml b/packages/SystemUI/res/drawable/ic_hotspot_unavailable.xml new file mode 100644 index 000000000000..736cfd8256b4 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_hotspot_unavailable.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2016 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:name="root" + android:height="48dp" + android:width="48dp" + android:viewportHeight="48" + android:viewportWidth="48" + android:tint="@color/qs_tile_tint_unavailable" > + <group + android:name="ic_hotspot" + android:translateX="23.97354" + android:translateY="24.26306" > + <group + android:name="ic_hotspot_pivot" + android:translateX="-23.21545" + android:translateY="-18.86649" > + <clip-path + android:name="mask" + android:pathData="M 38.8337860107,-40.3974914551 c 0.0,0.0 -38.4077911377,30.8523712158 -38.4077911377,30.8523712158 c 0.0,0.0 43.1884765625,43.515335083 43.1884765625,43.515335083 c 0.0,0.0 -2.4169921875,2.57838439941 -2.4169921875,2.57838439941 c 0.0,0.0 -42.9885101318,-43.0112609863 -42.9885101318,-43.0112609863 c 0.0,0.0 -32.6199798584,25.1699066162 -32.6199798584,25.1699066162 c 0.0,0.0 55.9664764404,69.742401123 55.9664764404,69.742401123 c 0.0,0.0 27.6589050293,-22.6579437256 27.6589050293,-22.6579437256 c 0.0,0.0 -30.8645172119,-34.00390625 -30.8645172119,-34.00390625 c 0.0,0.0 2.70756530762,-1.99278259277 2.70756530762,-1.99278259277 c 0.0,0.0 1.53030395508,-0.876571655273 1.53030395508,-0.876571655274 c 0.0,0.0 2.85780334473,-3.12069702148 2.85780334473,-3.12069702148 c 0.0,0.0 13.0984039307,13.025604248 13.0984039307,13.025604248 c 0.0,0.0 -3.13299560547,2.82977294922 -3.13299560547,2.82977294922 c 0.0,0.0 16.571762085,22.0471801758 16.571762085,22.0471801758 c 0.0,0.0 42.8175811768,-34.3554534912 42.8175811768,-34.3554534912 c 0.0,0.0 -55.9664916992,-69.7423400879 -55.9664916992,-69.7423400879 Z" /> + <group + android:name="cross" > + <path + android:name="cross_1" + android:pathData="M 4.44044494629,2.24310302734 c 0.0,0.0 35.4000396729,35.3999633789 35.4000396729,35.3999633789 " + android:strokeColor="#FFFFFFFF" + android:strokeAlpha="1" + android:strokeWidth="3.5" + android:fillColor="#00000000" /> + </group> + <group + android:name="hotspot" + android:translateX="23.481" + android:translateY="18.71151" > + <group + android:name="circles" + android:translateX="-0.23909" + android:translateY="-0.10807" > + <path + android:name="circle_3" + android:pathData="M 0.0843505859375,-2.93901062012 c -2.30102539062,0.0 -4.16702270508,1.86602783203 -4.16702270508,4.16702270508 c 0.0,2.29898071289 1.86599731445,4.16598510742 4.16702270508,4.16598510742 c 2.29998779297,0.0 4.16598510742,-1.86700439453 4.16598510742,-4.16598510742 c 0.0,-2.30099487305 -1.86599731445,-4.16702270508 -4.16598510742,-4.16702270508 Z M 11.1185302734,5.83390808105 c 0.0,0.0 0.0009765625,0.00100708007812 0.0009765625,0.00100708007812 c 0.14501953125,-0.356994628906 0.27099609375,-0.725006103516 0.382995605469,-1.09799194336 c 0.0570068359375,-0.195007324219 0.101013183594,-0.394989013672 0.149017333984,-0.595001220703 c 0.0690002441406,-0.281005859375 0.126983642578,-0.563995361328 0.175994873047,-0.851989746094 c 0.0270080566406,-0.169006347656 0.0559997558594,-0.337005615234 0.0759887695313,-0.509002685547 c 0.0580139160156,-0.468017578125 0.0970153808594,-0.942993164062 0.0970153808593,-1.4280090332 c 0.0,0.0 0.0,-0.00100708007812 0.0,-0.00100708007812 c 0.0,-5.03900146484 -3.11099243164,-9.3450012207 -7.5119934082,-11.1229858398 c -0.00601196289062,-0.00299072265625 -0.0130004882812,-0.0050048828125 -0.0190124511719,-0.00701904296875 c -0.686004638672,-0.275970458984 -1.39999389648,-0.492980957031 -2.14099121094,-0.638977050781 c -0.072998046875,-0.0150146484375 -0.149017333984,-0.02099609375 -0.222991943359,-0.0339965820313 c -0.302001953125,-0.0540161132812 -0.605010986328,-0.106018066406 -0.916015625,-0.136016845703 c -0.389984130859,-0.0390014648438 -0.786987304688,-0.0599975585938 -1.18899536133,-0.0599975585937 c -0.402008056641,0.0 -0.799011230469,0.02099609375 -1.19000244141,0.0599975585937 c -0.304992675781,0.0299987792969 -0.602996826172,0.0809936523438 -0.901000976563,0.132995605469 c -0.0790100097656,0.0150146484375 -0.160003662109,0.02099609375 -0.238006591797,0.0370178222656 c -0.368988037109,0.0719909667969 -0.730987548828,0.164001464844 -1.08700561523,0.269989013672 c -0.00299072265625,0.00100708007812 -0.0059814453125,0.00201416015625 -0.00900268554687,0.0020141601562 c -0.351989746094,0.10498046875 -0.694000244141,0.226989746094 -1.0309753418,0.361999511719 c -0.0110168457031,0.00399780273438 -0.0220031738281,0.00698852539062 -0.0320129394531,0.0119934082031 c -4.40200805664,1.77798461914 -7.51098632812,6.083984375 -7.5119934082,11.1229858398 c 0.0,0.00799560546875 0.00198364257812,0.0160217285156 0.0019836425781,0.0240173339844 c 0.00100708007812,0.475006103516 0.0380249023438,0.940002441406 0.0950012207032,1.39898681641 c 0.02001953125,0.175994873047 0.0490112304688,0.348999023438 0.0780029296875,0.523010253906 c 0.0469970703125,0.281982421875 0.105010986328,0.557983398438 0.171997070312,0.833984375 c 0.0480041503906,0.204010009766 0.093017578125,0.410003662109 0.152008056641,0.610015869141 c 0.110992431641,0.372009277344 0.238006591797,0.736999511719 0.382019042969,1.09298706055 c 0.0,0.0 0.0009765625,0.0 0.0009765625,0.0 c 1.00701904297,2.48400878906 2.81301879883,4.56100463867 5.11001586914,5.89501953125 c 0.0,0.0 2.01599121094,-3.48300170898 2.01599121094,-3.48300170898 c -2.03900146484,-1.18402099609 -3.5119934082,-3.22500610352 -3.89898681641,-5.63900756836 c 0.0,0.0 0.0009765625,-0.00100708007812 0.0009765625,-0.00100708007812 c -0.0220031738281,-0.130981445312 -0.0369873046875,-0.265991210938 -0.052978515625,-0.399993896484 c -0.0290222167969,-0.274993896484 -0.0570068359375,-0.552001953125 -0.0570068359375,-0.834991455078 c 0.0,0.0 0.0,-0.0190124511719 0.0,-0.0190124511719 c 0.0,-3.98999023438 2.92498779297,-7.28900146484 6.74398803711,-7.89199829102 c 0.0,0.0 0.0180053710938,0.0169982910156 0.0180053710938,0.0169982910156 c 0.404998779297,-0.0639953613281 0.81298828125,-0.125 1.23599243164,-0.125 c 0.0,0.0 0.00201416015625,0.0 0.00201416015624,0.0 c 0.0,0.0 0.00299072265625,0.0 0.00299072265626,0.0 c 0.423004150391,0.0 0.830017089844,0.0610046386719 1.23501586914,0.125 c 0.0,0.0 0.0169982910156,-0.0180053710938 0.0169982910156,-0.0180053710938 c 3.81997680664,0.60400390625 6.74499511719,3.90301513672 6.74499511719,7.89199829102 c 0.0,0.292999267578 -0.0280151367188,0.578002929688 -0.0589904785156,0.861999511719 c -0.0150146484375,0.132019042969 -0.0290222167969,0.264007568359 -0.051025390625,0.393005371094 c -0.385986328125,2.41500854492 -1.85897827148,4.45599365234 -3.89797973633,5.64001464844 c 0.0,0.0 2.01599121094,3.48300170898 2.01599121094,3.48300170898 c 2.29699707031,-1.33401489258 4.10299682617,-3.41101074219 5.11001586914,-5.89602661133 Z M 19.9300231934,2.95698547363 c 0.0059814453125,-0.0659790039062 0.0159912109375,-0.130981445312 0.02099609375,-0.196990966797 c 0.031982421875,-0.462005615234 0.0479736328125,-0.928009033203 0.0489807128906,-1.39700317383 c 0,0.0 0,-0.00997924804688 0,-0.00997924804687 c 0,0.0 0,-0.00100708007812 0,-0.00100708007813 c 0,-7.22500610352 -3.84399414062,-13.5360107422 -9.58599853516,-17.0500183105 c -1.06500244141,-0.652984619141 -2.19299316406,-1.20599365234 -3.37799072266,-1.65197753906 c -0.157989501953,-0.0599975585938 -0.317016601562,-0.118011474609 -0.476989746094,-0.174011230469 c -0.317016601562,-0.110992431641 -0.634002685547,-0.218994140625 -0.9580078125,-0.31298828125 c -0.470001220703,-0.139007568359 -0.944000244141,-0.264007568359 -1.4280090332,-0.368011474609 c -0.186004638672,-0.0390014648438 -0.376983642578,-0.0669860839844 -0.565002441406,-0.101013183594 c -0.414001464844,-0.0759887695312 -0.832000732422,-0.140991210938 -1.25500488281,-0.190979003906 c -0.184997558594,-0.0220031738281 -0.369995117188,-0.0429992675781 -0.556976318359,-0.0599975585937 c -0.592010498047,-0.0530090332031 -1.18801879883,-0.0899963378906 -1.79602050781,-0.0899963378907 c -0.605987548828,0.0 -1.20300292969,0.0369873046875 -1.79598999023,0.0899963378907 c -0.186004638672,0.0169982910156 -0.371002197266,0.0379943847656 -0.555999755859,0.0599975585937 c -0.423004150391,0.0499877929688 -0.842010498047,0.114990234375 -1.25601196289,0.190979003906 c -0.18798828125,0.0350036621094 -0.377990722656,0.06201171875 -0.563995361328,0.101013183594 c -0.483001708984,0.10400390625 -0.959991455078,0.22900390625 -1.42999267578,0.368011474609 c -0.321990966797,0.093994140625 -0.638000488281,0.201995849609 -0.953002929688,0.311981201172 c -0.162994384766,0.0570068359375 -0.324005126953,0.115997314453 -0.484985351562,0.177001953125 c -1.18099975586,0.445007324219 -2.30599975586,0.997009277344 -3.36801147461,1.64700317383 c -0.00201416015625,0.00100708007812 -0.00399780273438,0.00201416015625 -0.0060119628907,0.0029907226562 c -5.74099731445,3.51400756836 -9.58499145508,9.82501220703 -9.58599853516,17.0500183105 c 0,0.0 0,0.00100708007812 0,0.00100708007813 c 0,0.0059814453125 0.00100708007812,0.0130004882812 0.0010070800781,0.0199890136719 c 0.0,0.466003417969 0.0169982910156,0.928009033203 0.0490112304688,1.38598632812 c 0.0050048828125,0.0690002441406 0.0159912109375,0.136016845703 0.02099609375,0.206024169922 c 0.031982421875,0.401000976562 0.0719909667969,0.799987792969 0.127990722656,1.19400024414 c 0.00201416015625,0.0189819335938 0.00701904296875,0.0369873046875 0.010009765625,0.0569763183594 c 0.888000488281,6.17202758789 4.59799194336,11.4250183105 9.7799987793,14.4309997559 c 0.0,0.0 2.00198364258,-3.458984375 2.00198364258,-3.458984375 c -2.58599853516,-1.5 -4.708984375,-3.70401000977 -6.11697387695,-6.34399414063 c 0.0,0.0 0.0169982910156,-0.0180053710938 0.0169982910156,-0.0180053710938 c -0.890014648438,-1.67098999023 -1.50601196289,-3.5110168457 -1.76000976562,-5.46499633789 c -0.00698852539062,-0.0500183105469 -0.010009765625,-0.102020263672 -0.0159912109375,-0.152008056641 c -0.0330200195312,-0.273010253906 -0.0610046386719,-0.545989990234 -0.0800170898437,-0.821990966797 c -0.0220031738281,-0.343017578125 -0.0350036621094,-0.68701171875 -0.0350036621094,-1.03500366211 c 0,-6.53701782227 3.92599487305,-12.1480102539 9.54299926758,-14.6310119629 c 0.157012939453,-0.0700073242188 0.313995361328,-0.135986328125 0.472015380859,-0.199981689453 c 0.373992919922,-0.151000976562 0.751983642578,-0.294006347656 1.13900756836,-0.417022705078 c 0.108978271484,-0.0350036621094 0.221984863281,-0.0619812011719 0.332000732422,-0.0950012207031 c 0.349975585938,-0.102996826172 0.705993652344,-0.194976806641 1.06597900391,-0.273986816406 c 0.114013671875,-0.0249938964844 0.227996826172,-0.052001953125 0.342010498047,-0.0750122070313 c 0.440002441406,-0.0869750976562 0.885986328125,-0.154998779297 1.33700561523,-0.203979492188 c 0.10400390625,-0.0120239257812 0.209991455078,-0.02001953125 0.315002441406,-0.0299987792969 c 0.47998046875,-0.0429992675781 0.963989257812,-0.072998046875 1.45397949219,-0.072998046875 c 0.492004394531,0.0 0.975006103516,0.0299987792969 1.45401000977,0.072998046875 c 0.105987548828,0.00997924804688 0.212005615234,0.0179748535156 0.316986083984,0.0299987792969 c 0.450012207031,0.0489807128906 0.89501953125,0.117004394531 1.33502197266,0.203002929688 c 0.115997314453,0.0239868164062 0.22998046875,0.0509948730469 0.345001220703,0.0769958496094 c 0.358001708984,0.0780029296875 0.710998535156,0.169982910156 1.06097412109,0.272003173828 c 0.111022949219,0.0329895019531 0.226013183594,0.0609741210938 0.336029052734,0.0969848632813 c 0.385986328125,0.123016357422 0.761993408203,0.265014648438 1.13497924805,0.415008544922 c 0.160003662109,0.0650024414062 0.319000244141,0.131988525391 0.477020263672,0.201995849609 c 5.61599731445,2.48400878906 9.53997802734,8.09399414062 9.53997802734,14.6310119629 c 0,0.346984863281 -0.0130004882812,0.690979003906 -0.0350036621094,1.03399658203 c -0.0179748535156,0.274993896484 -0.0469970703125,0.548004150391 -0.0789794921875,0.819000244141 c -0.00601196289062,0.052001953125 -0.010009765625,0.10498046875 -0.0160217285156,0.154998779297 c -0.252990722656,1.95498657227 -0.871002197266,3.79400634766 -1.75997924805,5.46499633789 c 0.0,0.0 0.0169982910156,0.0180053710938 0.0169982910156,0.0180053710938 c -1.40802001953,2.63998413086 -3.53100585938,4.84399414062 -6.11700439453,6.34399414063 c 0.0,0.0 2.00198364258,3.458984375 2.00198364258,3.458984375 c 5.18402099609,-3.00698852539 8.89501953125,-8.26300048828 9.78100585938,-14.4379882813 c 0.00201416015625,-0.0169982910156 0.00601196289062,-0.0320129394531 0.0079956054688,-0.0490112304688 c 0.0570068359375,-0.39697265625 0.0970153808594,-0.798980712891 0.129028320312,-1.20300292969 Z" + android:fillColor="#FFFFFFFF" + android:fillAlpha="1" /> + </group> + </group> + </group> + </group> +</vector> diff --git a/packages/SystemUI/res/layout-television/recents_on_tv.xml b/packages/SystemUI/res/layout-television/recents_on_tv.xml index 82b9f8c3c48c..2b78beef3708 100644 --- a/packages/SystemUI/res/layout-television/recents_on_tv.xml +++ b/packages/SystemUI/res/layout-television/recents_on_tv.xml @@ -21,6 +21,7 @@ android:clipChildren="false" android:clipToPadding="false" android:background="@drawable/recents_tv_background_gradient"> + <com.android.systemui.recents.tv.views.TaskStackHorizontalGridView android:id="@+id/task_list" android:layout_width="wrap_content" @@ -32,13 +33,13 @@ android:focusable="true" android:layoutDirection="rtl" /> - <!-- Placeholder view to give focus to the PIP menus. --> + <!-- Placeholder view to give focus to the PIP menus in talkback mode --> <View android:id="@+id/pip" android:layout_width="1dp" android:layout_height="1dp" android:focusable="true" - android:visibility="visible" /> + android:visibility="gone" /> <!-- Placeholder to dismiss during talkback. --> <ImageView diff --git a/packages/SystemUI/res/layout/keyguard_status_bar.xml b/packages/SystemUI/res/layout/keyguard_status_bar.xml index b5f917a4e574..a2dfc0dd115d 100644 --- a/packages/SystemUI/res/layout/keyguard_status_bar.xml +++ b/packages/SystemUI/res/layout/keyguard_status_bar.xml @@ -27,7 +27,7 @@ <com.android.systemui.statusbar.phone.MultiUserSwitch android:id="@+id/multi_user_switch" android:layout_width="@dimen/multi_user_switch_width_keyguard" - android:layout_height="@dimen/status_bar_header_height_keyguard" + android:layout_height="match_parent" android:layout_alignParentEnd="true" android:background="@drawable/ripple_drawable" android:layout_marginEnd="@dimen/multi_user_switch_keyguard_margin"> @@ -43,7 +43,7 @@ android:layout_height="@dimen/status_bar_header_height" android:layout_toStartOf="@id/multi_user_switch" android:layout_alignWithParentIfMissing="true" - android:layout_marginStart="16dp" + android:layout_marginStart="@dimen/system_icons_super_container_margin_start" android:paddingEnd="@dimen/system_icons_keyguard_padding_end"> <FrameLayout android:id="@+id/system_icons_container" android:layout_width="wrap_content" @@ -67,7 +67,7 @@ <com.android.keyguard.CarrierText android:id="@+id/keyguard_carrier_text" android:layout_width="match_parent" - android:layout_height="@dimen/status_bar_header_height_keyguard" + android:layout_height="match_parent" android:layout_marginStart="@dimen/keyguard_carrier_text_margin" android:layout_toStartOf="@id/system_icons_super_container" android:gravity="center_vertical" diff --git a/packages/SystemUI/res/layout/qs_detail.xml b/packages/SystemUI/res/layout/qs_detail.xml index 32839d8ca1af..63390e2337ae 100644 --- a/packages/SystemUI/res/layout/qs_detail.xml +++ b/packages/SystemUI/res/layout/qs_detail.xml @@ -44,7 +44,7 @@ android:layout_height="wrap_content" /> - <ScrollView + <com.android.systemui.qs.NonInterceptingScrollView android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1"> @@ -52,7 +52,7 @@ android:id="@android:id/content" android:layout_width="match_parent" android:layout_height="wrap_content" /> - </ScrollView> + </com.android.systemui.qs.NonInterceptingScrollView> <include layout="@layout/qs_detail_buttons" /> diff --git a/packages/SystemUI/res/layout/tv_pip_control_button.xml b/packages/SystemUI/res/layout/tv_pip_control_button.xml index f18a5da03570..096dda881693 100644 --- a/packages/SystemUI/res/layout/tv_pip_control_button.xml +++ b/packages/SystemUI/res/layout/tv_pip_control_button.xml @@ -23,15 +23,25 @@ <ImageView android:id="@+id/button" android:layout_width="34dp" android:layout_height="34dp" - android:padding="5dp" + android:layout_alignParentTop="true" + android:layout_centerHorizontal="true" android:focusable="true" - android:src="@drawable/ic_fullscreen_white_24dp" - android:background="@drawable/tv_pip_button_focused" - android:layerType="software" /> + android:src="@drawable/tv_pip_button_focused" + android:importantForAccessibility="yes" /> + + <ImageView android:id="@+id/icon" + android:layout_width="34dp" + android:layout_height="34dp" + android:layout_alignParentTop="true" + android:layout_centerHorizontal="true" + android:padding="5dp" + android:importantForAccessibility="no" /> <TextView android:id="@+id/desc" android:layout_width="100dp" android:layout_height="wrap_content" + android:layout_below="@id/icon" + android:layout_centerHorizontal="true" android:layout_marginTop="3dp" android:gravity="center" android:text="@string/pip_fullscreen" diff --git a/packages/SystemUI/res/layout/tv_pip_recents_overlay.xml b/packages/SystemUI/res/layout/tv_pip_recents_overlay.xml index 557bbe66b29b..f157fd59b23d 100644 --- a/packages/SystemUI/res/layout/tv_pip_recents_overlay.xml +++ b/packages/SystemUI/res/layout/tv_pip_recents_overlay.xml @@ -15,7 +15,7 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="top|center_horizontal" android:orientation="vertical"> @@ -33,7 +33,8 @@ android:layout_height="32dp" android:translationY="-46dp" android:layout_gravity="top|center_horizontal" - android:background="@drawable/tv_pip_recents_overlay_scrim" /> + android:background="@drawable/tv_pip_recents_overlay_scrim" + android:alpha="0" /> <com.android.systemui.tv.pip.PipControlsView android:id="@+id/pip_control_contents" android:layout_width="wrap_content" @@ -42,6 +43,8 @@ android:layout_gravity="top|center_horizontal" /> </com.android.systemui.tv.pip.PipRecentsControlsView> + <!-- Placeholder view to handle focus change between Recents row and PIP controls + in talkback mode --> <View android:id="@+id/recents" android:layout_width="1dp" diff --git a/packages/SystemUI/res/layout/zen_mode_button.xml b/packages/SystemUI/res/layout/zen_mode_button.xml new file mode 100644 index 000000000000..f25131b6b360 --- /dev/null +++ b/packages/SystemUI/res/layout/zen_mode_button.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2016 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<RadioButton + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@android:id/checkbox" + android:layout_width="40dp" + android:layout_marginStart="7dp" + android:layout_marginEnd="4dp" + android:layout_height="48dp" + android:layout_alignParentStart="true" + android:gravity="center" + android:paddingTop="10dp" + android:paddingBottom="10dp"> + +</RadioButton>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/zen_mode_condition.xml b/packages/SystemUI/res/layout/zen_mode_condition.xml index 53f39083acd1..ca4f7278a5ae 100644 --- a/packages/SystemUI/res/layout/zen_mode_condition.xml +++ b/packages/SystemUI/res/layout/zen_mode_condition.xml @@ -18,18 +18,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:clipChildren="false" - android:layout_marginBottom="@dimen/zen_mode_condition_detail_item_spacing" android:layout_marginStart="1dp" - android:layout_marginEnd="0dp" > - - <RadioButton - android:id="@android:id/checkbox" - android:layout_width="40dp" - android:layout_marginStart="7dp" - android:layout_marginEnd="4dp" - android:layout_height="48dp" - android:layout_alignParentStart="true" - android:gravity="center" /> + android:layout_marginEnd="0dp" + android:layout_weight="1" + android:gravity="center_vertical" > <LinearLayout android:id="@android:id/content" diff --git a/packages/SystemUI/res/layout/zen_mode_panel.xml b/packages/SystemUI/res/layout/zen_mode_panel.xml index 43ab4bb4e1db..906b8679931b 100644 --- a/packages/SystemUI/res/layout/zen_mode_panel.xml +++ b/packages/SystemUI/res/layout/zen_mode_panel.xml @@ -94,9 +94,18 @@ android:layout_marginTop="8dp" android:layout_marginEnd="4dp" android:layout_marginStart="4dp" - android:orientation="vertical" - android:paddingBottom="@dimen/zen_mode_condition_detail_bottom_padding" /> - + android:paddingBottom="@dimen/zen_mode_condition_detail_bottom_padding" + android:orientation="horizontal" > + <RadioGroup + android:id="@+id/zen_radio_buttons" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + <LinearLayout + android:id="@+id/zen_radio_buttons_content" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical"/> + </LinearLayout> <TextView android:id="@+id/zen_alarm_warning" diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml index 9c5c9ec7fb66..d9138ef0def1 100644 --- a/packages/SystemUI/res/values-af/strings.xml +++ b/packages/SystemUI/res/values-af/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Liggingversoeke aktief"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Verwyder alle kennisgewings."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other">nog <xliff:g id="NUMBER_1">%s</xliff:g> kennisgewings binne.</item> + <item quantity="one">nog <xliff:g id="NUMBER_0">%s</xliff:g> kennisgewing binne.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Kennisgewingsinstellings"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g>-instellings"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Die skerm sal outomaties draai."</string> diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml index 44894160fe20..69d6642e506f 100644 --- a/packages/SystemUI/res/values-am/strings.xml +++ b/packages/SystemUI/res/values-am/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"የአካባቢ ጥያቄዎች ነቅተዋል"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"ሁሉንም ማሳወቂያዎች አጽዳ"</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="one">ከውስጥ ተጨማሪ <xliff:g id="NUMBER_1">%s</xliff:g> ማሳወቂያዎች።</item> + <item quantity="other">ከውስጥ ተጨማሪ <xliff:g id="NUMBER_1">%s</xliff:g> ማሳወቂያዎች።</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"የማሳወቂያ ቅንብሮች"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"የ<xliff:g id="APP_NAME">%s</xliff:g> ቅንብሮች"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"ማያ ገጽ በራስ ሰር ይዞራል።"</string> diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index 88e3d90fbda4..d7962de2b2c7 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -249,6 +249,14 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"طلبات الموقع نشطة"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"محو جميع الإشعارات."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"و<xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="zero"><xliff:g id="NUMBER_1">%s</xliff:g> إشعار آخر بداخل المجموعة.</item> + <item quantity="two">إشعاران (<xliff:g id="NUMBER_1">%s</xliff:g>) آخران بداخل المجموعة.</item> + <item quantity="few"><xliff:g id="NUMBER_1">%s</xliff:g> إشعارات أخرى بداخل المجموعة.</item> + <item quantity="many"><xliff:g id="NUMBER_1">%s</xliff:g> إشعارًا آخر بداخل المجموعة.</item> + <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> إشعار آخر بداخل المجموعة.</item> + <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> إشعار آخر بداخل المجموعة.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"إعدادات الإشعارات"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"إعدادات <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"سيتم تدوير الشاشة تلقائيًا."</string> diff --git a/packages/SystemUI/res/values-az-rAZ/strings.xml b/packages/SystemUI/res/values-az-rAZ/strings.xml index 683651dd9aca..acb58cef039c 100644 --- a/packages/SystemUI/res/values-az-rAZ/strings.xml +++ b/packages/SystemUI/res/values-az-rAZ/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Məkan sorğuları arxivi"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Bütün bildirişləri sil."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other">Daxilində daha <xliff:g id="NUMBER_1">%s</xliff:g> bildiriş.</item> + <item quantity="one">Daxilində daha <xliff:g id="NUMBER_0">%s</xliff:g> bildiriş.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Bildiriş ayarları"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> ayarları"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Ekran avtomatik döndəriləcək."</string> diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings.xml b/packages/SystemUI/res/values-b+sr+Latn/strings.xml index b382cc897119..f944e4b68853 100644 --- a/packages/SystemUI/res/values-b+sr+Latn/strings.xml +++ b/packages/SystemUI/res/values-b+sr+Latn/strings.xml @@ -246,6 +246,11 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Ima aktivnih zahteva za lokaciju"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Obriši sva obaveštenja."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"i još <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="one">Još <xliff:g id="NUMBER_1">%s</xliff:g> obaveštenje u grupi.</item> + <item quantity="few">Još <xliff:g id="NUMBER_1">%s</xliff:g> obaveštenja u grupi.</item> + <item quantity="other">Još <xliff:g id="NUMBER_1">%s</xliff:g> obaveštenja u grupi.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Podešavanja obaveštenja"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Podešavanja za <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Ekran će se automatski rotirati."</string> diff --git a/packages/SystemUI/res/values-be-rBY/strings.xml b/packages/SystemUI/res/values-be-rBY/strings.xml index bc1259a3ddf8..12ba0cd909de 100644 --- a/packages/SystemUI/res/values-be-rBY/strings.xml +++ b/packages/SystemUI/res/values-be-rBY/strings.xml @@ -53,8 +53,8 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Прывязаныя праз Bluetooth"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Налада метадаў уводу"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Фізічная клавіятура"</string> - <string name="usb_device_permission_prompt" msgid="834698001271562057">"Дазволіць праыкладанню <xliff:g id="APPLICATION">%1$s</xliff:g> атрымлiваць доступ да прылады USB?"</string> - <string name="usb_accessory_permission_prompt" msgid="5171775411178865750">"Дазволіць прыкладанню <xliff:g id="APPLICATION">%1$s</xliff:g> доступ да прылады USB?"</string> + <string name="usb_device_permission_prompt" msgid="834698001271562057">"Дазволіць праграме <xliff:g id="APPLICATION">%1$s</xliff:g> атрымлiваць доступ да прылады USB?"</string> + <string name="usb_accessory_permission_prompt" msgid="5171775411178865750">"Дазволіць праграме <xliff:g id="APPLICATION">%1$s</xliff:g> доступ да USB-аксесуара?"</string> <string name="usb_device_confirm_prompt" msgid="5161205258635253206">"Адкрыць <xliff:g id="ACTIVITY">%1$s</xliff:g>, калі гэтая USB-прылада падлучаная?"</string> <string name="usb_accessory_confirm_prompt" msgid="3808984931830229888">"Адкрыць <xliff:g id="ACTIVITY">%1$s</xliff:g>, калі гэтая USB-прылада падлучаная?"</string> <string name="usb_accessory_uri_prompt" msgid="513450621413733343">"Няма ўсталяв. прыкл. для працы з гэтай прыл. USB. Больш падраб. пра гэтую прыл.: <xliff:g id="URL">%1$s</xliff:g>"</string> @@ -136,7 +136,7 @@ <string name="accessibility_three_bars" msgid="2648241415119396648">"Тры слупкi."</string> <string name="accessibility_signal_full" msgid="9122922886519676839">"Сігнал поўны."</string> <string name="accessibility_desc_on" msgid="2385254693624345265">"Уключана."</string> - <string name="accessibility_desc_off" msgid="6475508157786853157">"Адключана."</string> + <string name="accessibility_desc_off" msgid="6475508157786853157">"Выключана."</string> <string name="accessibility_desc_connected" msgid="8366256693719499665">"Падключана."</string> <string name="accessibility_desc_connecting" msgid="3812924520316280149">"Падлучэнне."</string> <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> @@ -249,6 +249,12 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Ёсць актыўныя запыты пра месцазнаходжанне"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Выдалiць усе апавяшчэннi."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="one">Яшчэ <xliff:g id="NUMBER_1">%s</xliff:g> апавяшчэнне ўнутры.</item> + <item quantity="few">Яшчэ <xliff:g id="NUMBER_1">%s</xliff:g> апавяшчэнні ўнутры.</item> + <item quantity="many">Яшчэ <xliff:g id="NUMBER_1">%s</xliff:g> апавяшчэнняў унутры.</item> + <item quantity="other">Яшчэ <xliff:g id="NUMBER_1">%s</xliff:g> апавяшчэння ўнутры.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Налады апавяшчэнняў"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Налады <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Экран паварочваецца аўтаматычна."</string> @@ -486,7 +492,7 @@ <string name="do_not_silence_block" msgid="4070647971382232311">"Не адключаць гук і не блакіраваць"</string> <string name="tuner_full_importance_settings" msgid="3207312268609236827">"Пашыранае кіраванне апавяшчэннямі"</string> <string name="tuner_full_importance_settings_on" msgid="7545060756610299966">"Уключана"</string> - <string name="tuner_full_importance_settings_off" msgid="8208165412614935229">"Адключана"</string> + <string name="tuner_full_importance_settings_off" msgid="8208165412614935229">"Выключана"</string> <string name="power_notification_controls_description" msgid="4372459941671353358">"З дапамогай пашыранага кіравання апавяшчэннямі вы можаце задаваць узровень важнасці апавяшчэнняў праграмы ад 0 да 5. \n\n"<b>"Узровень 5"</b>" \n- Паказваць уверсе спіса апавяшчэнняў \n- Дазваляць перапыняць рэжым поўнага экрана \n- Заўсёды дазваляць кароткі паказ \n\n"<b>"Узровень 4"</b>" \n- Забараняць перапыняць рэжым поўнага экрана \n- Заўсёды дазваляць кароткі паказ \n\n"<b>"Узровень 3"</b>" \n- Забараняць перапыняць рэжым поўнага экрана \n- Ніколі не дазваляць кароткі паказ \n\n"<b>"Узровень 2"</b>" \n- Забараняць перапыняць рэжым поўнага экрана \n- Ніколі не дазваляць кароткі паказ \n- Ніколі не прайграваць гук і не вібрыраваць \n\n"<b>"Узровень 1"</b>" \n- Забараняць перапыняць рэжым поўнага экрана \n- Ніколі не дазваляць кароткі паказ \n- Ніколі не прайграваць гук і не вібрыраваць \n- Хаваць з экрана блакіроўкі і панэлі стану \n- Паказваць унізе спіса апавяшчэнняў \n\n"<b>"Узровень 0"</b>" \n- Блакіраваць усе апавяшчэнні ад праграмы"</string> <string name="user_unspecified_importance" msgid="361613856933432117">"Важнасць: аўтаматычна"</string> <string name="blocked_importance" msgid="5035073235408414397">"Важнасць: узровень 0"</string> @@ -509,7 +515,7 @@ <string name="night_mode" msgid="3540405868248625488">"Начны рэжым"</string> <string name="calibrate_display" msgid="5974642573432039217">"Каліброўка дысплэя"</string> <string name="night_mode_on" msgid="5597545513026541108">"Уключана"</string> - <string name="night_mode_off" msgid="8035605276956057508">"Адключана"</string> + <string name="night_mode_off" msgid="8035605276956057508">"Выключана"</string> <string name="turn_on_automatically" msgid="4167565356762016083">"Уключаць аўтаматычна"</string> <string name="turn_on_auto_summary" msgid="2190994512406701520">"Пераключэнне ў начны рэжым у залежнасці ад канкрэтнай мясцовасці і часу сутак"</string> <string name="when_night_mode_on" msgid="2969436026899172821">"Калі ўключаны Начны рэжым"</string> @@ -579,7 +585,7 @@ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Эканомія трафіку ўключана"</string> <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Эканомія трафіку адключана"</string> <string name="switch_bar_on" msgid="1142437840752794229">"Уключана"</string> - <string name="switch_bar_off" msgid="8803270596930432874">"Адключана"</string> + <string name="switch_bar_off" msgid="8803270596930432874">"Выключана"</string> <string name="nav_bar" msgid="1993221402773877607">"Панэль навігацыі"</string> <string name="start" msgid="6873794757232879664">"Пачатак"</string> <string name="center" msgid="4327473927066010960">"Цэнтр"</string> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index 41f3bbdb9a7a..8d7e8da337dc 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Активни заявки за местоположение"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Изчистване на всички известия."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other">Съдържа още <xliff:g id="NUMBER_1">%s</xliff:g> известия.</item> + <item quantity="one">Съдържа още <xliff:g id="NUMBER_0">%s</xliff:g> известие.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Настройки за известия"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Настройки за <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Екранът ще се завърта автоматично."</string> diff --git a/packages/SystemUI/res/values-bn-rBD/strings.xml b/packages/SystemUI/res/values-bn-rBD/strings.xml index 70530301f0bf..e32fb06ae179 100644 --- a/packages/SystemUI/res/values-bn-rBD/strings.xml +++ b/packages/SystemUI/res/values-bn-rBD/strings.xml @@ -51,8 +51,8 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"ব্লুটুথ টিথার করা হয়েছে"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"ইনপুট পদ্ধতিগুলি সেট আপ করুন"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"ফিজিক্যাল কীবোর্ড"</string> - <string name="usb_device_permission_prompt" msgid="834698001271562057">"এই <xliff:g id="APPLICATION">%1$s</xliff:g> অ্যাপ্লিকেশানটিকে কি USB ডিভাইস অ্যাক্সেস করা মঞ্জুরি দেবেন?"</string> - <string name="usb_accessory_permission_prompt" msgid="5171775411178865750">"এই <xliff:g id="APPLICATION">%1$s</xliff:g> অ্যাপ্লিকেশানটিকে কি USB যন্ত্রাংশ অ্যাক্সেস করার মঞ্জুরি দেবেন?"</string> + <string name="usb_device_permission_prompt" msgid="834698001271562057">"এই <xliff:g id="APPLICATION">%1$s</xliff:g> অ্যাপ্লিকেশানটিকে কি USB ডিভাইস অ্যাক্সেস করা অনুমতি দেবেন?"</string> + <string name="usb_accessory_permission_prompt" msgid="5171775411178865750">"এই <xliff:g id="APPLICATION">%1$s</xliff:g> অ্যাপ্লিকেশানটিকে কি USB যন্ত্রাংশ অ্যাক্সেস করার অনুমতি দেবেন?"</string> <string name="usb_device_confirm_prompt" msgid="5161205258635253206">"যখন এই USB ডিভাইসটি সংযুক্ত থাকে তখন কি <xliff:g id="ACTIVITY">%1$s</xliff:g> খুলবেন?"</string> <string name="usb_accessory_confirm_prompt" msgid="3808984931830229888">"যখন এই USB যন্ত্রাংশটি সংযুক্ত থাকে তখন কি <xliff:g id="ACTIVITY">%1$s</xliff:g> খুলবেন?"</string> <string name="usb_accessory_uri_prompt" msgid="513450621413733343">"ইনস্টল থাকা কোনো অ্যাপ্লিকেশান এই USB যন্ত্রাংশের সাথে কাজ করে না৷ <xliff:g id="URL">%1$s</xliff:g> এ এই যন্ত্রাংশের সম্পর্কে আরো জানুন৷"</string> @@ -64,7 +64,7 @@ <string name="usb_debugging_message" msgid="2220143855912376496">"কম্পিউটারের RSA কী আঙ্গুলের ছাপ হল:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string> <string name="usb_debugging_always" msgid="303335496705863070">"এই কম্পিউটার থেকে সর্বদা অনুমতি দিন"</string> <string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB ডিবাগিং অনুমোদিত নয়"</string> - <string name="usb_debugging_secondary_user_message" msgid="8572228137833020196">"ব্যবহারকারী বর্তমানে এই ডিভাইসটিতে সাইন ইন করেছেন তাই USB ডিবাগিং চালু করা যাবে না। এই বৈশিষ্ট্যটি ব্যবহার করতে, অনুগ্রহ করে প্রশাসক ব্যবহারকারীতে পাল্টান।"</string> + <string name="usb_debugging_secondary_user_message" msgid="8572228137833020196">"ব্যবহারকারী বর্তমানে এই ডিভাইসটিতে প্রবেশ করুন করেছেন তাই USB ডিবাগিং চালু করা যাবে না। এই বৈশিষ্ট্যটি ব্যবহার করতে, অনুগ্রহ করে প্রশাসক ব্যবহারকারীতে পাল্টান।"</string> <string name="compat_mode_on" msgid="6623839244840638213">"স্ক্রীণ পূরণ করতে জুম করুন"</string> <string name="compat_mode_off" msgid="4434467572461327898">"পূর্ণ স্ক্রীণে প্রসারিত করুন"</string> <string name="screenshot_saving_ticker" msgid="7403652894056693515">"স্ক্রীনশট সংরক্ষণ করা হচ্ছে..."</string> @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"অবস্থান অনুরোধ সক্রিয় রয়েছে"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"সমস্ত বিজ্ঞপ্তি সাফ করুন৷"</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>টি"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="one">ভিতরে আরও <xliff:g id="NUMBER_1">%s</xliff:g>টি বিজ্ঞপ্তি আছে।</item> + <item quantity="other">ভিতরে আরও <xliff:g id="NUMBER_1">%s</xliff:g>টি বিজ্ঞপ্তি আছে।</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"বিজ্ঞপ্তির সেটিংস"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> সেটিংস"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"স্ক্রীন স্বয়ংক্রিয়ভাবে ঘুরে যাবে৷"</string> @@ -425,7 +429,7 @@ <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"আপনি পরের বার সেটিংস-এ এটি চালু করলে এটি উপস্থিত হবে"</string> <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"লুকান"</string> <string name="volumeui_prompt_message" msgid="918680947433389110">"<xliff:g id="APP_NAME">%1$s</xliff:g> ভলিউম ডায়লগ হতে চায়৷"</string> - <string name="volumeui_prompt_allow" msgid="7954396902482228786">"মঞ্জুরি দিন"</string> + <string name="volumeui_prompt_allow" msgid="7954396902482228786">"অনুমতি দিন"</string> <string name="volumeui_prompt_deny" msgid="5720663643411696731">"প্রত্যাখ্যান করুন"</string> <string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> হল ভলিউম ডায়লগ"</string> <string name="volumeui_notification_text" msgid="8819536904234337445">"আসলটি পুনঃস্থাপন করতে আলতো চাপ দিন৷"</string> @@ -514,7 +518,7 @@ <string name="night_mode_disclaimer" msgid="598914896926759578">"Android OS এর মূল অংশগুলিতে গাঢ় থিম প্রয়োগ করা হয়েছে যেটা সাধারণত একটি হালকা থিমে প্রদর্শিত হয়, যেমন সেটিংস৷"</string> <string name="color_apply" msgid="9212602012641034283">"প্রয়োগ করুন"</string> <string name="color_revert_title" msgid="4746666545480534663">"সেটিংস নিশ্চিত করুন"</string> - <string name="color_revert_message" msgid="9116001069397996691">"কিছু রঙের সেটিংস এই ডিভাইসকে ব্যবহারের অযোগ্য করে দিতে পারে৷ এই রঙের সেটিংস নিশ্চিত করতে ওকে এ ক্লিক করুন, অন্যথায় ১০ সেকেন্ড পরে এই সেটিংস পুনরায় সেট হবে৷"</string> + <string name="color_revert_message" msgid="9116001069397996691">"কিছু রঙের সেটিংস এই ডিভাইসকে ব্যবহারের অযোগ্য করে দিতে পারে৷ এই রঙের সেটিংস নিশ্চিত করতে ঠিক আছে এ ক্লিক করুন, অন্যথায় ১০ সেকেন্ড পরে এই সেটিংস পুনরায় সেট হবে৷"</string> <string name="battery_panel_title" msgid="7944156115535366613">"ব্যাটারির ব্যবহার"</string> <string name="battery_detail_charging_summary" msgid="1279095653533044008">"চার্জ করার সময় ব্যাটারি সেভার উপলব্ধ নয়"</string> <string name="battery_detail_switch_title" msgid="6285872470260795421">"ব্যাটারি সেভার"</string> @@ -637,7 +641,7 @@ <string name="accessibility_quick_settings_expand" msgid="2375165227880477530">"দ্রুত সেটিংস খুলুন৷"</string> <string name="accessibility_quick_settings_collapse" msgid="1792625797142648105">"দ্রুত সেটিংস বন্ধ করুন৷"</string> <string name="accessibility_quick_settings_alarm_set" msgid="1863000242431528676">"অ্যালার্ম সেট করা হয়েছে৷"</string> - <string name="accessibility_quick_settings_user" msgid="1567445362870421770">"<xliff:g id="ID_1">%s</xliff:g> হিসেবে সাইন ইন রয়েছেন"</string> + <string name="accessibility_quick_settings_user" msgid="1567445362870421770">"<xliff:g id="ID_1">%s</xliff:g> হিসেবে প্রবেশ করুন রয়েছেন"</string> <string name="accessibility_quick_settings_no_internet" msgid="31890692343084075">"কোন ইন্টারনেট নেই৷"</string> <string name="accessibility_quick_settings_open_details" msgid="4230931801728005194">"বিশদ বিবরণ খুলুন৷"</string> <string name="accessibility_quick_settings_open_settings" msgid="7806613775728380737">"<xliff:g id="ID_1">%s</xliff:g> সেটিংস খুলুন৷"</string> diff --git a/packages/SystemUI/res/values-bs-rBA/strings.xml b/packages/SystemUI/res/values-bs-rBA/strings.xml index ef9926f86bdd..c0b898510eb8 100644 --- a/packages/SystemUI/res/values-bs-rBA/strings.xml +++ b/packages/SystemUI/res/values-bs-rBA/strings.xml @@ -97,7 +97,7 @@ <string name="voice_assist_label" msgid="3956854378310019854">"otvori glasovnu pomoć"</string> <string name="camera_label" msgid="7261107956054836961">"otvori kameru"</string> <string name="recents_caption_resize" msgid="3517056471774958200">"Izaberite novi raspored zadataka"</string> - <string name="cancel" msgid="6442560571259935130">"Prekini"</string> + <string name="cancel" msgid="6442560571259935130">"Otkaži"</string> <string name="accessibility_compatibility_zoom_button" msgid="8461115318742350699">"Dugme za uvećavanje u slučaju nekompatibilnosti."</string> <string name="accessibility_compatibility_zoom_example" msgid="4220687294564945780">"Uvećani prikaz manjeg ekrana na većem ekranu."</string> <string name="accessibility_bluetooth_connected" msgid="2707027633242983370">"Bluetooth je povezan."</string> @@ -246,6 +246,11 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Aktiviran je zahtjev za lokaciju"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Uklanjanje svih obavještenja."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="one">Još <xliff:g id="NUMBER_1">%s</xliff:g> obavještenje unutra.</item> + <item quantity="few">Još <xliff:g id="NUMBER_1">%s</xliff:g> obavještenja unutra.</item> + <item quantity="other">Još <xliff:g id="NUMBER_1">%s</xliff:g> obavještenja unutra.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Postavke obavještenja"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Postavke aplikacije <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Ekran će se automatski rotirati."</string> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index cb765fb1d0e9..789fdc314776 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Sol·licituds d\'ubicació actives"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Esborra totes les notificacions."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> notificacions més a l\'interior.</item> + <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> notificació més a l\'interior.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Configuració de les notificacions"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Configuració de l\'aplicació <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"La pantalla girarà automàticament."</string> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index 2f1db1b659e1..2f5d97ceac84 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -249,6 +249,12 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Aktivní žádosti o polohu"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Vymazat všechna oznámení."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"a ještě <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="few">Skupina obsahuje ještě <xliff:g id="NUMBER_1">%s</xliff:g> oznámení.</item> + <item quantity="many">Skupina obsahuje ještě <xliff:g id="NUMBER_1">%s</xliff:g> oznámení.</item> + <item quantity="other">Skupina obsahuje ještě <xliff:g id="NUMBER_1">%s</xliff:g> oznámení.</item> + <item quantity="one">Skupina obsahuje ještě <xliff:g id="NUMBER_0">%s</xliff:g> oznámení.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Nastavení oznámení"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Nastavení aplikace <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Obrazovka se automaticky otočí."</string> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index 7d3ca4fcfa5b..19d612daeb65 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Aktive placeringsanmodninger"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Ryd alle underretninger."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"<xliff:g id="NUMBER">%s</xliff:g> mere"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="one"><xliff:g id="NUMBER_1">%s</xliff:g> underretning mere i gruppen.</item> + <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> underretninger mere i gruppen.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Underretningsindstillinger"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Indstillinger for <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Skærmen roterer automatisk."</string> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index f2133122f14b..47040db054ac 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -247,6 +247,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Standortanfragen aktiv"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Alle Benachrichtigungen löschen"</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> weitere Benachrichtigungen vorhanden.</item> + <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> weitere Benachrichtigung vorhanden.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Benachrichtigungseinstellungen"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Einstellungen von <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Bildschirm wird automatisch gedreht."</string> @@ -587,14 +591,14 @@ <string name="add_button" msgid="4134946063432258161">"Schaltfläche hinzufügen"</string> <string name="save" msgid="2311877285724540644">"Speichern"</string> <string name="reset" msgid="2448168080964209908">"Zurücksetzen"</string> - <string name="no_home_title" msgid="1563808595146071549">"Startbildschirm-Schaltfläche fehlt"</string> - <string name="no_home_message" msgid="5408485011659260911">"Zur Bedienung dieses Geräts wird eine Schaltfläche für den Startbildschirm benötigt. Bitte füge vor dem Speichern eine entsprechende Schaltfläche hinzu."</string> + <string name="no_home_title" msgid="1563808595146071549">"Startbildschirmtaste fehlt"</string> + <string name="no_home_message" msgid="5408485011659260911">"Um dieses Gerät bedienen zu können, braucht man eine Startbildschirmtaste. Bitte füge vor dem Speichern eine entsprechende Schaltfläche hinzu."</string> <string name="adjust_button_width" msgid="6138616087197632947">"Schaltflächenbreite anpassen"</string> <string name="clipboard" msgid="1313879395099896312">"Zwischenablage"</string> <string name="clipboard_description" msgid="3819919243940546364">"Elemente können direkt in die Zwischenablage gezogen werden. Ebenso können sie direkt aus der Zwischenablage gezogen werden, sofern diese geöffnet ist."</string> <string name="accessibility_key" msgid="5701989859305675896">"Benutzerdefinierte Navigationsschaltfläche"</string> <string name="keycode" msgid="7335281375728356499">"Keycode"</string> - <string name="keycode_description" msgid="1403795192716828949">"Mit den Keycode-Schaltflächen können der Navigationsleiste Tasten hinzugefügt werden. Wird eine Keycode-Schaltfläche ausgewählt, führt sie die Aktion der entsprechenden Taste aus. Wählen Sie zuerst die Taste für die Schaltfläche aus und anschließend ein Bild, das auf der Schaltfläche erscheinen soll."</string> + <string name="keycode_description" msgid="1403795192716828949">"Mit den Keycode-Schaltflächen kann man der Navigationsleiste Tasten hinzufügen. Wird eine Keycode-Schaltfläche ausgewählt, führt sie die Aktion der entsprechenden Taste aus. Wähle zuerst die Taste für die Schaltfläche aus und dann ein Bild, das auf der Schaltfläche erscheinen soll."</string> <string name="select_keycode" msgid="7413765103381924584">"Taste auswählen"</string> <string name="preview" msgid="9077832302472282938">"Vorschau"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Zum Hinzufügen von Kacheln ziehen"</string> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index cd6181641bf8..0c3c6ffb79d7 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Τα αιτήματα τοποθεσίας έχουν ενεργοποιηθεί"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Εκκαθάριση όλων των ειδοποιήσεων."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> επιπλέον ειδοποιήσεις εντός της ομάδας.</item> + <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> επιπλέον ειδοποίηση εντός της ομάδας.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Ρυθμίσεις ειδοποιήσεων"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Ρυθμίσεις <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Θα γίνεται αυτόματη περιστροφή της οθόνης."</string> diff --git a/packages/SystemUI/res/values-en-rAU/strings.xml b/packages/SystemUI/res/values-en-rAU/strings.xml index 803c7a279581..2ede27943e60 100644 --- a/packages/SystemUI/res/values-en-rAU/strings.xml +++ b/packages/SystemUI/res/values-en-rAU/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Location requests active"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Clear all notifications."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+<xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <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> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Notification settings"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> settings"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Screen will rotate automatically."</string> @@ -316,7 +320,7 @@ <string name="recents_empty_message" msgid="808480104164008572">"No recent items"</string> <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"You\'ve cleared everything"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Application Info"</string> - <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"screen pinning"</string> + <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"screen-pinning"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"search"</string> <string name="recents_launch_error_message" msgid="2969287838120550506">"Could not start <xliff:g id="APP">%s</xliff:g>."</string> <string name="recents_launch_disabled_message" msgid="1624523193008871793">"<xliff:g id="APP">%s</xliff:g> is disabled in safe-mode."</string> @@ -498,7 +502,7 @@ <string name="notification_importance_high" msgid="1729480727023990427">"Always peek. No full screen interruption."</string> <string name="notification_importance_max" msgid="2508384624461849111">"Always peek, and allow full screen interruption."</string> <string name="notification_more_settings" msgid="816306283396553571">"More settings"</string> - <string name="notification_done" msgid="5279426047273930175">"Finished"</string> + <string name="notification_done" msgid="5279426047273930175">"Done"</string> <string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> notification controls"</string> <string name="color_and_appearance" msgid="1254323855964993144">"Colour and appearance"</string> <string name="night_mode" msgid="3540405868248625488">"Night mode"</string> @@ -597,7 +601,7 @@ <string name="preview" msgid="9077832302472282938">"Preview"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Drag to add tiles"</string> <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Drag here to remove"</string> - <string name="qs_edit" msgid="2232596095725105230">"(edit)"</string> + <string name="qs_edit" msgid="2232596095725105230">"Edit"</string> <string name="tuner_time" msgid="6572217313285536011">"Time"</string> <string-array name="clock_options"> <item msgid="5965318737560463480">"Show hours, minutes and seconds"</item> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index 803c7a279581..2ede27943e60 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Location requests active"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Clear all notifications."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+<xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <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> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Notification settings"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> settings"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Screen will rotate automatically."</string> @@ -316,7 +320,7 @@ <string name="recents_empty_message" msgid="808480104164008572">"No recent items"</string> <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"You\'ve cleared everything"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Application Info"</string> - <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"screen pinning"</string> + <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"screen-pinning"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"search"</string> <string name="recents_launch_error_message" msgid="2969287838120550506">"Could not start <xliff:g id="APP">%s</xliff:g>."</string> <string name="recents_launch_disabled_message" msgid="1624523193008871793">"<xliff:g id="APP">%s</xliff:g> is disabled in safe-mode."</string> @@ -498,7 +502,7 @@ <string name="notification_importance_high" msgid="1729480727023990427">"Always peek. No full screen interruption."</string> <string name="notification_importance_max" msgid="2508384624461849111">"Always peek, and allow full screen interruption."</string> <string name="notification_more_settings" msgid="816306283396553571">"More settings"</string> - <string name="notification_done" msgid="5279426047273930175">"Finished"</string> + <string name="notification_done" msgid="5279426047273930175">"Done"</string> <string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> notification controls"</string> <string name="color_and_appearance" msgid="1254323855964993144">"Colour and appearance"</string> <string name="night_mode" msgid="3540405868248625488">"Night mode"</string> @@ -597,7 +601,7 @@ <string name="preview" msgid="9077832302472282938">"Preview"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Drag to add tiles"</string> <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Drag here to remove"</string> - <string name="qs_edit" msgid="2232596095725105230">"(edit)"</string> + <string name="qs_edit" msgid="2232596095725105230">"Edit"</string> <string name="tuner_time" msgid="6572217313285536011">"Time"</string> <string-array name="clock_options"> <item msgid="5965318737560463480">"Show hours, minutes and seconds"</item> diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml index 803c7a279581..2ede27943e60 100644 --- a/packages/SystemUI/res/values-en-rIN/strings.xml +++ b/packages/SystemUI/res/values-en-rIN/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Location requests active"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Clear all notifications."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+<xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <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> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Notification settings"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> settings"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Screen will rotate automatically."</string> @@ -316,7 +320,7 @@ <string name="recents_empty_message" msgid="808480104164008572">"No recent items"</string> <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"You\'ve cleared everything"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Application Info"</string> - <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"screen pinning"</string> + <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"screen-pinning"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"search"</string> <string name="recents_launch_error_message" msgid="2969287838120550506">"Could not start <xliff:g id="APP">%s</xliff:g>."</string> <string name="recents_launch_disabled_message" msgid="1624523193008871793">"<xliff:g id="APP">%s</xliff:g> is disabled in safe-mode."</string> @@ -498,7 +502,7 @@ <string name="notification_importance_high" msgid="1729480727023990427">"Always peek. No full screen interruption."</string> <string name="notification_importance_max" msgid="2508384624461849111">"Always peek, and allow full screen interruption."</string> <string name="notification_more_settings" msgid="816306283396553571">"More settings"</string> - <string name="notification_done" msgid="5279426047273930175">"Finished"</string> + <string name="notification_done" msgid="5279426047273930175">"Done"</string> <string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> notification controls"</string> <string name="color_and_appearance" msgid="1254323855964993144">"Colour and appearance"</string> <string name="night_mode" msgid="3540405868248625488">"Night mode"</string> @@ -597,7 +601,7 @@ <string name="preview" msgid="9077832302472282938">"Preview"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Drag to add tiles"</string> <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Drag here to remove"</string> - <string name="qs_edit" msgid="2232596095725105230">"(edit)"</string> + <string name="qs_edit" msgid="2232596095725105230">"Edit"</string> <string name="tuner_time" msgid="6572217313285536011">"Time"</string> <string-array name="clock_options"> <item msgid="5965318737560463480">"Show hours, minutes and seconds"</item> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index 1bed37835d48..6a57c134d769 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -247,6 +247,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Solicitudes de ubicación activas"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Eliminar todas las notificaciones"</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"<xliff:g id="NUMBER">%s</xliff:g> más"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> notificaciones más en el grupo.</item> + <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> notificación más en el grupo.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Configuración de notificaciones"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Configuración de <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"La pantalla girará automáticamente."</string> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index da7d87294177..5e0fa43e7936 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -21,13 +21,13 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="7164937344850004466">"IU del sistema"</string> <string name="status_bar_clear_all_button" msgid="7774721344716731603">"Borrar"</string> - <string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Eliminar de la lista"</string> + <string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Quitar de la lista"</string> <string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Información de la aplicación"</string> - <string name="status_bar_no_recent_apps" msgid="7374907845131203189">"Aquí aparecerán tus pantallas recientes"</string> + <string name="status_bar_no_recent_apps" msgid="7374907845131203189">"Aquí aparecerán tus aplicaciones recientes"</string> <string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Descartar aplicaciones recientes"</string> <plurals name="status_bar_accessibility_recent_apps" formatted="false" msgid="9138535907802238759"> - <item quantity="other">%d pantallas en Visión general</item> - <item quantity="one">1 pantalla en Visión general</item> + <item quantity="other">%d pantallas en Aplicaciones recientes</item> + <item quantity="one">1 pantalla en Aplicaciones recientes</item> </plurals> <string name="status_bar_no_notifications_title" msgid="4755261167193833213">"No tienes notificaciones"</string> <string name="status_bar_ongoing_events_title" msgid="1682504513316879202">"Entrante"</string> @@ -83,7 +83,7 @@ <string name="accessibility_back" msgid="567011538994429120">"Atrás"</string> <string name="accessibility_home" msgid="8217216074895377641">"Inicio"</string> <string name="accessibility_menu" msgid="316839303324695949">"Menú"</string> - <string name="accessibility_recent" msgid="5208608566793607626">"Visión general"</string> + <string name="accessibility_recent" msgid="5208608566793607626">"Aplicaciones recientes"</string> <string name="accessibility_search_light" msgid="1103867596330271848">"Buscar"</string> <string name="accessibility_camera_button" msgid="8064671582820358152">"Cámara"</string> <string name="accessibility_phone_button" msgid="6738112589538563574">"Teléfono"</string> @@ -183,7 +183,7 @@ <string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Ajustes rápidos"</string> <string name="accessibility_desc_lock_screen" msgid="5625143713611759164">"Pantalla de bloqueo."</string> <string name="accessibility_desc_settings" msgid="3417884241751434521">"Ajustes"</string> - <string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Visión general."</string> + <string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Aplicaciones recientes."</string> <string name="accessibility_desc_close" msgid="7479755364962766729">"Cerrar"</string> <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Usuario <xliff:g id="USER">%s</xliff:g>"</string> <string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string> @@ -247,6 +247,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Solicitudes de ubicación activas"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Borrar todas las notificaciones"</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"<xliff:g id="NUMBER">%s</xliff:g> más"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> notificaciones más dentro.</item> + <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> notificación más dentro.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Ajustes de notificaciones"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Ajustes de <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"La pantalla girará automáticamente."</string> @@ -365,22 +369,22 @@ <string name="user_new_user_name" msgid="426540612051178753">"Nuevo usuario"</string> <string name="guest_nickname" msgid="8059989128963789678">"Invitado"</string> <string name="guest_new_guest" msgid="600537543078847803">"Añadir invitado"</string> - <string name="guest_exit_guest" msgid="7187359342030096885">"Eliminar invitado"</string> - <string name="guest_exit_guest_dialog_title" msgid="8480693520521766688">"¿Eliminar invitado?"</string> + <string name="guest_exit_guest" msgid="7187359342030096885">"Quitar invitado"</string> + <string name="guest_exit_guest_dialog_title" msgid="8480693520521766688">"¿Quitar invitado?"</string> <string name="guest_exit_guest_dialog_message" msgid="4155503224769676625">"Se eliminarán las aplicaciones y los datos de esta sesión."</string> - <string name="guest_exit_guest_dialog_remove" msgid="7402231963862520531">"Eliminar"</string> + <string name="guest_exit_guest_dialog_remove" msgid="7402231963862520531">"Quitar"</string> <string name="guest_wipe_session_title" msgid="6419439912885956132">"Hola de nuevo, invitado"</string> <string name="guest_wipe_session_message" msgid="8476238178270112811">"¿Quieres continuar con la sesión?"</string> <string name="guest_wipe_session_wipe" msgid="5065558566939858884">"Volver a empezar"</string> <string name="guest_wipe_session_dontwipe" msgid="1401113462524894716">"Sí, continuar"</string> <string name="guest_notification_title" msgid="1585278533840603063">"Usuario invitado"</string> - <string name="guest_notification_text" msgid="335747957734796689">"Para eliminar aplicaciones y datos, quita usuario invitado"</string> - <string name="guest_notification_remove_action" msgid="8820670703892101990">"ELIMINAR INVITADO"</string> + <string name="guest_notification_text" msgid="335747957734796689">"Para eliminar aplicaciones y datos, quita el usuario invitado"</string> + <string name="guest_notification_remove_action" msgid="8820670703892101990">"QUITAR INVITADO"</string> <string name="user_logout_notification_title" msgid="1453960926437240727">"Salir de usuario"</string> <string name="user_logout_notification_text" msgid="3350262809611876284">"Salir de usuario actual"</string> <string name="user_logout_notification_action" msgid="1195428991423425062">"SALIR DE USUARIO"</string> <string name="user_add_user_title" msgid="4553596395824132638">"¿Añadir nuevo usuario?"</string> - <string name="user_add_user_message_short" msgid="2161624834066214559">"Al añadir un usuario nuevo, este debe configurar su espacio.\n\nCualquier usuario puede actualizar las aplicaciones del resto de usuarios."</string> + <string name="user_add_user_message_short" msgid="2161624834066214559">"Al añadir un nuevo usuario, este debe configurar su espacio.\n\nCualquier usuario puede actualizar las aplicaciones del resto de usuarios."</string> <string name="user_remove_user_title" msgid="4681256956076895559">"¿Quitar usuario?"</string> <string name="user_remove_user_message" msgid="1453218013959498039">"Se eliminarán todas las aplicaciones y todos los datos de este usuario."</string> <string name="user_remove_user_remove" msgid="7479275741742178297">"Quitar"</string> @@ -442,7 +446,7 @@ <string name="show_battery_percentage_summary" msgid="3215025775576786037">"Mostrar el porcentaje del nivel de batería en el icono de la barra de estado cuando no se esté cargando"</string> <string name="quick_settings" msgid="10042998191725428">"Ajustes rápidos"</string> <string name="status_bar" msgid="4877645476959324760">"Barra de estado"</string> - <string name="overview" msgid="4018602013895926956">"Visión general"</string> + <string name="overview" msgid="4018602013895926956">"Aplicaciones recientes"</string> <string name="demo_mode" msgid="2389163018533514619">"Modo de demostración"</string> <string name="enable_demo_mode" msgid="4844205668718636518">"Habilitar modo de demostración"</string> <string name="show_demo_mode" msgid="2018336697782464029">"Mostrar modo de demostración"</string> @@ -464,15 +468,15 @@ <string name="tuner_persistent_warning" msgid="8597333795565621795">"Estas funciones experimentales pueden cambiar, fallar o desaparecer en futuras versiones. Te recomendamos que tengas cuidado."</string> <string name="got_it" msgid="2239653834387972602">"Entendido"</string> <string name="tuner_toast" msgid="603429811084428439">"¡Enhorabuena! El configurador de IU del sistema se ha añadido a Ajustes"</string> - <string name="remove_from_settings" msgid="8389591916603406378">"Eliminar de Ajustes"</string> - <string name="remove_from_settings_prompt" msgid="6069085993355887748">"¿Eliminar el configurador de IU del sistema de Ajustes y dejar de utilizar sus funciones?"</string> + <string name="remove_from_settings" msgid="8389591916603406378">"Quitar de Ajustes"</string> + <string name="remove_from_settings_prompt" msgid="6069085993355887748">"¿Quitar el configurador de IU del sistema de Ajustes y dejar de utilizar sus funciones?"</string> <string name="activity_not_found" msgid="348423244327799974">"La aplicación no está instalada en tu dispositivo"</string> <string name="clock_seconds" msgid="7689554147579179507">"Mostrar los segundos del reloj"</string> <string name="clock_seconds_desc" msgid="6282693067130470675">"Muestra los segundos del reloj en la barra de estado. Puede afectar a la duración de la batería."</string> <string name="qs_rearrange" msgid="8060918697551068765">"Reorganizar Ajustes rápidos"</string> <string name="show_brightness" msgid="6613930842805942519">"Mostrar brillo en Ajustes rápidos"</string> <string name="overview_nav_bar_gesture" msgid="8579814204727917764">"Habilitar deslizar dedo hacia arriba para dividir pantalla"</string> - <string name="overview_nav_bar_gesture_desc" msgid="6329167382305102615">"Habilita el gesto de deslizar el dedo hacia arriba desde el botón Visión general para acceder al modo de pantalla dividida"</string> + <string name="overview_nav_bar_gesture_desc" msgid="6329167382305102615">"Habilita el gesto de deslizar el dedo hacia arriba desde el botón Aplicaciones recientes para acceder al modo de pantalla dividida"</string> <string name="experimental" msgid="6198182315536726162">"Experimental"</string> <string name="enable_bluetooth_title" msgid="5027037706500635269">"¿Activar Bluetooth?"</string> <string name="enable_bluetooth_message" msgid="9106595990708985385">"Para poder conectar tu teclado a tu tablet, debes activar el Bluetooth."</string> diff --git a/packages/SystemUI/res/values-et-rEE/strings.xml b/packages/SystemUI/res/values-et-rEE/strings.xml index 72cd8179fe19..405d351f726c 100644 --- a/packages/SystemUI/res/values-et-rEE/strings.xml +++ b/packages/SystemUI/res/values-et-rEE/strings.xml @@ -247,6 +247,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Asukoha taotlused on aktiivsed"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Kustuta kõik teatised."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other">Sees on veel <xliff:g id="NUMBER_1">%s</xliff:g> märguannet.</item> + <item quantity="one">Sees on veel <xliff:g id="NUMBER_0">%s</xliff:g> märguanne.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Märguandeseaded"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Rakenduse <xliff:g id="APP_NAME">%s</xliff:g> seaded"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Ekraani pööramine toimub automaatselt."</string> diff --git a/packages/SystemUI/res/values-eu-rES/strings.xml b/packages/SystemUI/res/values-eu-rES/strings.xml index 84a360657be0..d8e3446ec952 100644 --- a/packages/SystemUI/res/values-eu-rES/strings.xml +++ b/packages/SystemUI/res/values-eu-rES/strings.xml @@ -247,6 +247,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Aplikazioen kokapen-eskaerak aktibo daude"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Garbitu jakinarazpen guztiak."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other">Beste <xliff:g id="NUMBER_1">%s</xliff:g> jakinarazpen daude barnean.</item> + <item quantity="one">Beste <xliff:g id="NUMBER_0">%s</xliff:g> jakinarazpen daude barnean.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Jakinarazpen-ezarpenak"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> ezarpenak"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Pantaila automatikoki biratuko da."</string> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index 52c45bbf7ba0..7c77d59c578c 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"درخواستهای موقعیت مکانی فعال است"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"پاک کردن تمام اعلانها"</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="one"><xliff:g id="NUMBER_1">%s</xliff:g> اعلان دیگر در گروه.</item> + <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> اعلان دیگر در گروه.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"تنظیمات اعلان"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"تنظیمات <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"صفحه به صورت خودکار میچرخد."</string> @@ -340,7 +344,7 @@ <string name="zen_silence_introduction" msgid="3137882381093271568">"این کار «همه» صداها و لرزشها از جمله هشدارها، موسیقی، ویدیوها و بازیها را مسدود میکند."</string> <string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string> <string name="speed_bump_explanation" msgid="1288875699658819755">"اعلانهای کمتر فوری در زیر"</string> - <string name="notification_tap_again" msgid="7590196980943943842">"برای باز کردن دوباره ضربه بزنید"</string> + <string name="notification_tap_again" msgid="7590196980943943842">"دوباره ضربه بزنید تا باز شود"</string> <string name="keyguard_unlock" msgid="8043466894212841998">"برای باز کردن قفل سریع به بالا بکشید"</string> <string name="phone_hint" msgid="4872890986869209950">"انگشتتان را از نماد تلفن تند بکشید"</string> <string name="voice_hint" msgid="8939888732119726665">"برای «دستیار صوتی»، تند بکشید"</string> @@ -399,15 +403,15 @@ <string name="disable_vpn" msgid="4435534311510272506">"غیرفعال کردن VPN"</string> <string name="disconnect_vpn" msgid="1324915059568548655">"قطع اتصال VPN"</string> <string name="monitoring_description_device_owned" msgid="5780988291898461883">"مدیریت دستگاه شما توسط <xliff:g id="ORGANIZATION">%1$s</xliff:g>.\n\nسرپرستتان میتواند تنظیمات، دسترسی شرکت، برنامهها دادههای مرتبط با دستگاهتان و اطلاعات مکان دستگاهتان را کنترل و مدیریت کند. برای دریافت اطلاعات بیشتر، با سرپرستتان تماس بگیرید."</string> - <string name="monitoring_description_vpn" msgid="4445150119515393526">"شما به برنامهای برای تنظیم اتصال VPN اجازه دادید.\n\n این برنامه میتواند دستگاه و فعالیت شبکهتان را کنترل کند، از جمله ایمیل، برنامه و وبسایتها."</string> + <string name="monitoring_description_vpn" msgid="4445150119515393526">"شما به برنامهای برای تنظیم اتصال VPN اجازه دادید.\n\n این برنامه میتواند دستگاه و فعالیت شبکهتان را کنترل کند، از جمله رایانامه، برنامه و وبسایتها."</string> <string name="monitoring_description_vpn_device_owned" msgid="3090670777499161246">"دستگاهتان توسط <xliff:g id="ORGANIZATION">%1$s</xliff:g> مدیریت میشود.\n\nسرپرستتان میتواند تنظیمات، دسترسی شرکت، برنامهها، دادههای مرتبط با دستگاهتان و اطلاعات مکان دستگاهتان را کنترل و مدیریت کند.\n\nشما به یک VPN وصل هستید که میتواند فعالیت شبکه شما را کنترل کند، از جمله ایمیلها، برنامهها و وبسایتها.\n\nبرای دریافت اطلاعات بیشتر، با سرپرستتان تماس بگیرید."</string> - <string name="monitoring_description_vpn_profile_owned" msgid="2054949132145039290">"نمایه کاری شما توسط <xliff:g id="ORGANIZATION">%1$s</xliff:g> مدیریت میشود.\n\nسرپرستتان میتواند فعالیت شبکهتان از جمله ایمیل، برنامه و وبسایتها را کنترل کند.\n\nبرای دریافت اطلاعات بیشتر با سرپرستتان تماس بگیرید.\n\nهمچنین به یک VPN وصل هستید که میتواند فعالیت شبکه شما را کنترل کند."</string> + <string name="monitoring_description_vpn_profile_owned" msgid="2054949132145039290">"نمایه کاری شما توسط <xliff:g id="ORGANIZATION">%1$s</xliff:g> مدیریت میشود.\n\nسرپرستتان میتواند فعالیت شبکهتان از جمله رایانامه، برنامه و وبسایتها را کنترل کند.\n\nبرای دریافت اطلاعات بیشتر با سرپرستتان تماس بگیرید.\n\nهمچنین به یک VPN وصل هستید که میتواند فعالیت شبکه شما را کنترل کند."</string> <string name="legacy_vpn_name" msgid="6604123105765737830">"VPN"</string> - <string name="monitoring_description_app" msgid="6259179342284742878">"شما به <xliff:g id="APPLICATION">%1$s</xliff:g> وصل شدهاید، که میتواند فعالیت شبکه شما از جمله ایمیل، برنامه و وبسایتها را کنترل کند."</string> - <string name="monitoring_description_app_personal" msgid="484599052118316268">"شما به <xliff:g id="APPLICATION">%1$s</xliff:g> وصل شدهاید، که میتواند فعالیت شبکه شخصی شما از جمله ایمیل، برنامه و وبسایتها را کنترل کند."</string> - <string name="monitoring_description_app_work" msgid="1754325860918060897">"نمایه کاریتان توسط <xliff:g id="ORGANIZATION">%1$s</xliff:g> مدیریت میشود. این به <xliff:g id="APPLICATION">%2$s</xliff:g> وصل است که فعالیت شبکه کاریتان از جمله ایمیل، برنامه و وبسایتها را کنترل میکند.\n\nبرای دریافت اطلاعات بیشتر، با سرپرستتان تماس بگیرید."</string> - <string name="monitoring_description_app_personal_work" msgid="4946600443852045903">"نمایه کاری شما توسط <xliff:g id="ORGANIZATION">%1$s</xliff:g> مدیریت میشود. این به <xliff:g id="APPLICATION_WORK">%2$s</xliff:g> متصل است که میتواند فعالیت شبکه کاریتان از جمله ایمیل، برنامه و وبسایتها را کنترل کند.\n\nشما همچنین به <xliff:g id="APPLICATION_PERSONAL">%3$s</xliff:g> متصل هستید که میتواند فعالیت شبکه شخصیتان را کنترل کند."</string> - <string name="monitoring_description_vpn_app_device_owned" msgid="4970443827043261703">"دستگاهتان توسط <xliff:g id="ORGANIZATION">%1$s</xliff:g> مدیریت میشود.\n\nسرپرستتان میتواند تنظیمات، دسترسی شرکت، برنامهها، دادههای مرتبط با دستگاهتان و اطلاعات مکان دستگاهتان را کنترل و مدیریت کند.\n\nشما به <xliff:g id="APPLICATION">%2$s</xliff:g> وصل هستید که میتواند فعالیت شبکه شما را کنترل کند، از جمله ایمیل، برنامه و وبسایتها.\n\nبرای دریافت اطلاعات بیشتر، با سرپرستتان تماس بگیرید."</string> + <string name="monitoring_description_app" msgid="6259179342284742878">"شما به <xliff:g id="APPLICATION">%1$s</xliff:g> وصل شدهاید، که میتواند فعالیت شبکه شما از جمله رایانامه، برنامه و وبسایتها را کنترل کند."</string> + <string name="monitoring_description_app_personal" msgid="484599052118316268">"شما به <xliff:g id="APPLICATION">%1$s</xliff:g> وصل شدهاید، که میتواند فعالیت شبکه شخصی شما از جمله رایانامه، برنامه و وبسایتها را کنترل کند."</string> + <string name="monitoring_description_app_work" msgid="1754325860918060897">"نمایه کاریتان توسط <xliff:g id="ORGANIZATION">%1$s</xliff:g> مدیریت میشود. این به <xliff:g id="APPLICATION">%2$s</xliff:g> وصل است که فعالیت شبکه کاریتان از جمله رایانامه، برنامه و وبسایتها را کنترل میکند.\n\nبرای دریافت اطلاعات بیشتر، با سرپرستتان تماس بگیرید."</string> + <string name="monitoring_description_app_personal_work" msgid="4946600443852045903">"نمایه کاری شما توسط <xliff:g id="ORGANIZATION">%1$s</xliff:g> مدیریت میشود. این به <xliff:g id="APPLICATION_WORK">%2$s</xliff:g> متصل است که میتواند فعالیت شبکه کاریتان از جمله رایانامه، برنامه و وبسایتها را کنترل کند.\n\nشما همچنین به <xliff:g id="APPLICATION_PERSONAL">%3$s</xliff:g> متصل هستید که میتواند فعالیت شبکه شخصیتان را کنترل کند."</string> + <string name="monitoring_description_vpn_app_device_owned" msgid="4970443827043261703">"دستگاهتان توسط <xliff:g id="ORGANIZATION">%1$s</xliff:g> مدیریت میشود.\n\nسرپرستتان میتواند تنظیمات، دسترسی شرکت، برنامهها، دادههای مرتبط با دستگاهتان و اطلاعات مکان دستگاهتان را کنترل و مدیریت کند.\n\nشما به <xliff:g id="APPLICATION">%2$s</xliff:g> وصل هستید که میتواند فعالیت شبکه شما را کنترل کند، از جمله رایانامه، برنامه و وبسایتها.\n\nبرای دریافت اطلاعات بیشتر، با سرپرستتان تماس بگیرید."</string> <string name="keyguard_indication_trust_disabled" msgid="7412534203633528135">"دستگاه قفل باقی میماند تا زمانی که قفل آن را به صورت دستی باز کنید"</string> <string name="hidden_notifications_title" msgid="7139628534207443290">"دریافت سریعتر اعلانها"</string> <string name="hidden_notifications_text" msgid="2326409389088668981">"قبل از باز کردن قفل آنها را مشاهده کنید"</string> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index 2516fcf8f2e6..3ae25e1a194f 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Sijaintipyynnöt aktiiviset"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Tyhjennä kaikki ilmoitukset."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other">+<xliff:g id="NUMBER_1">%s</xliff:g> ilmoitusta ryhmässä</item> + <item quantity="one">+<xliff:g id="NUMBER_0">%s</xliff:g> ilmoitus ryhmässä</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Ilmoitusasetukset"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Asetukset – <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Ruutu kääntyy automaattisesti."</string> diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml index 732abb3d60c0..9aa176f98932 100644 --- a/packages/SystemUI/res/values-fr-rCA/strings.xml +++ b/packages/SystemUI/res/values-fr-rCA/strings.xml @@ -247,6 +247,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Demandes de localisation actives"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Supprimer toutes les notifications"</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="one"><xliff:g id="NUMBER_1">%s</xliff:g> autre notification à l\'intérieur.</item> + <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> autres notifications à l\'intérieur.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Paramètres de notification"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Paramètres de <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"L\'écran pivote automatiquement."</string> @@ -380,7 +384,7 @@ <string name="user_logout_notification_text" msgid="3350262809611876284">"Déconnecter l\'utilisateur actuel"</string> <string name="user_logout_notification_action" msgid="1195428991423425062">"DÉCONNECTER L\'UTILISATEUR"</string> <string name="user_add_user_title" msgid="4553596395824132638">"Ajouter un utilisateur?"</string> - <string name="user_add_user_message_short" msgid="2161624834066214559">"Lorsque vous ajoutez un utilisateur, celui-ci doit configurer son espace.\n\nN\'importe quel utilisateur peut mettre à jour les applications pour tous les autres utilisateurs."</string> + <string name="user_add_user_message_short" msgid="2161624834066214559">"Lorsque vous ajoutez un utilisateur, celui-ci doit configurer son espace.\n\nTout utilisateur peut mettre à jour les applications pour tous les autres utilisateurs."</string> <string name="user_remove_user_title" msgid="4681256956076895559">"Supprimer l\'utilisateur?"</string> <string name="user_remove_user_message" msgid="1453218013959498039">"Toutes les applications et les données de cet utilisateur seront supprimées."</string> <string name="user_remove_user_remove" msgid="7479275741742178297">"Supprimer"</string> @@ -390,7 +394,7 @@ <string name="media_projection_dialog_text" msgid="3071431025448218928">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> commencer à enregistrer tout ce qui s\'affiche sur votre écran."</string> <string name="media_projection_remember_text" msgid="3103510882172746752">"Ne plus afficher"</string> <string name="clear_all_notifications_text" msgid="814192889771462828">"Tout effacer"</string> - <string name="media_projection_action_text" msgid="8470872969457985954">"Commencer maintenant"</string> + <string name="media_projection_action_text" msgid="8470872969457985954">"Commencer"</string> <string name="empty_shade_text" msgid="708135716272867002">"Aucune notification"</string> <string name="device_owned_footer" msgid="3802752663326030053">"Il est possible que cet appareil soit surveillé."</string> <string name="profile_owned_footer" msgid="8021888108553696069">"le profil peut être contrôlé"</string> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index 00cb2a14c3d3..b6c08cae9bb1 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -247,6 +247,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Demandes de localisation actives"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Supprimer toutes les notifications"</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"<xliff:g id="NUMBER">%s</xliff:g> autres"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="one"><xliff:g id="NUMBER_1">%s</xliff:g> autre notification à l\'intérieur.</item> + <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> autres notifications à l\'intérieur.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Paramètres de notification"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Paramètres de <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"L\'écran pivote automatiquement."</string> diff --git a/packages/SystemUI/res/values-gl-rES/strings.xml b/packages/SystemUI/res/values-gl-rES/strings.xml index ae4a850d9434..c18bae79ee40 100644 --- a/packages/SystemUI/res/values-gl-rES/strings.xml +++ b/packages/SystemUI/res/values-gl-rES/strings.xml @@ -247,6 +247,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Solicitudes de localización activas"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Eliminar todas as notificacións."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> notificacións máis no grupo.</item> + <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> notificación máis no grupo.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Configuración das notificacións"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Configuración de <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"A pantalla xirará automaticamente."</string> diff --git a/packages/SystemUI/res/values-gu-rIN/strings.xml b/packages/SystemUI/res/values-gu-rIN/strings.xml index 6743e83cacc7..8c00ebd82db8 100644 --- a/packages/SystemUI/res/values-gu-rIN/strings.xml +++ b/packages/SystemUI/res/values-gu-rIN/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"સ્થાન વિનંતીઓ સક્રિય"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"બધા સૂચનો સાફ કરો."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="one"><xliff:g id="NUMBER_1">%s</xliff:g> વધુ સૂચના અંદર છે.</item> + <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> વધુ સૂચના અંદર છે.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"સૂચનાઓની સેટિંગ્સ"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> સેટિંગ્સ"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"સ્ક્રીન આપમેળે ફરશે."</string> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index 5d5db684bb0e..983faed99bdd 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"स्थान अनुरोध सक्रिय"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"सभी सूचनाएं साफ़ करें."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="one">इसमें <xliff:g id="NUMBER_1">%s</xliff:g> और नोटिफ़िकेशन हैं.</item> + <item quantity="other">इसमें <xliff:g id="NUMBER_1">%s</xliff:g> और नोटिफ़िकेशन हैं.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"नोटिफिकेशन सेटिंग"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> सेटिंग"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"स्क्रीन स्वचालित रूप से घूमेगी."</string> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index 699294039198..e1afb4d361e8 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -246,6 +246,11 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Zahtjevi za lokaciju aktivni su"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Brisanje svih obavijesti."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"još <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="one">U skupini je još <xliff:g id="NUMBER_1">%s</xliff:g> obavijest.</item> + <item quantity="few">U skupini su još <xliff:g id="NUMBER_1">%s</xliff:g> obavijesti.</item> + <item quantity="other">U skupini je još <xliff:g id="NUMBER_1">%s</xliff:g> obavijesti.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Postavke obavijesti"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Postavke aplikacije <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Zaslon će se automatski zakrenuti."</string> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index 022b76a868cc..ca2ca61ec3d1 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Aktív helylekérések"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Minden értesítés törlése"</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> további értesítés.</item> + <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> további értesítés.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Értesítési beállítások"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> beállításai"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"A képernyő automatikusan forogni fog."</string> diff --git a/packages/SystemUI/res/values-hy-rAM/strings.xml b/packages/SystemUI/res/values-hy-rAM/strings.xml index b7a333b0e832..01dcee2ad61f 100644 --- a/packages/SystemUI/res/values-hy-rAM/strings.xml +++ b/packages/SystemUI/res/values-hy-rAM/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Տեղադրության հարցումներն ակտիվ են"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Մաքրել բոլոր ծանուցումները:"</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="one">Ներսում ևս <xliff:g id="NUMBER_1">%s</xliff:g> ծանուցում կա:</item> + <item quantity="other">Ներսում ևս <xliff:g id="NUMBER_1">%s</xliff:g> ծանուցում կա:</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Ծանուցման կարգավորումներ"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g>-ի կարգավորումներ"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Էկրանը ինքնաշխատ կպտտվի:"</string> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index b9aa766eb2da..293cd0070081 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -187,7 +187,7 @@ <string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string> <string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi dinonaktifkan."</string> <string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi diaktifkan."</string> - <string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Seluler <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string> + <string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Ponsel <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string> <string name="accessibility_quick_settings_battery" msgid="1480931583381408972">"Baterai <xliff:g id="STATE">%s</xliff:g>."</string> <string name="accessibility_quick_settings_airplane_off" msgid="7786329360056634412">"Mode pesawat nonaktif."</string> <string name="accessibility_quick_settings_airplane_on" msgid="6406141469157599296">"Mode pesawat aktif."</string> @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Permintaan lokasi aktif"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Menghapus semua pemberitahuan."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> notifikasi lainnya di dalam.</item> + <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> notifikasi lainnya di dalam.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Setelan pemberitahuan"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> setelan"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Layar akan diputar secara otomatis."</string> @@ -378,7 +382,7 @@ <string name="user_logout_notification_text" msgid="3350262809611876284">"Keluarkan pengguna saat ini"</string> <string name="user_logout_notification_action" msgid="1195428991423425062">"KELUARKAN PENGGUNA"</string> <string name="user_add_user_title" msgid="4553596395824132638">"Tambahkan pengguna baru?"</string> - <string name="user_add_user_message_short" msgid="2161624834066214559">"Saat Anda menambahkan pengguna baru, orang tersebut perlu menyiapkan ruangnya sendiri.\n\n1Pengguna mana pun dapat memperbarui aplikasi untuk semua pengguna lain."</string> + <string name="user_add_user_message_short" msgid="2161624834066214559">"Saat Anda menambahkan pengguna baru, orang tersebut perlu menyiapkan ruangnya sendiri.\n\nPengguna mana pun dapat memperbarui aplikasi untuk semua pengguna lain."</string> <string name="user_remove_user_title" msgid="4681256956076895559">"Hapus pengguna?"</string> <string name="user_remove_user_message" msgid="1453218013959498039">"Semua aplikasi dan data pengguna ini akan dihapus."</string> <string name="user_remove_user_remove" msgid="7479275741742178297">"Hapus"</string> diff --git a/packages/SystemUI/res/values-is-rIS/strings.xml b/packages/SystemUI/res/values-is-rIS/strings.xml index 45a07c1c1357..05e6256a979b 100644 --- a/packages/SystemUI/res/values-is-rIS/strings.xml +++ b/packages/SystemUI/res/values-is-rIS/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Staðsetningarbeiðnir virkar"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Hreinsa allar tilkynningar."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="one"><xliff:g id="NUMBER_1">%s</xliff:g> tilkynning í viðbót.</item> + <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> tilkynningar í viðbót.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Tilkynningastillingar"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Stillingar fyrir <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Skjárinn snýst sjálfkrafa."</string> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index f352d50ca3d0..e8aacd5eb5db 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -247,6 +247,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Richieste di accesso alla posizione attive"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Cancella tutte le notifiche."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other">Altre <xliff:g id="NUMBER_1">%s</xliff:g> notifiche nel gruppo.</item> + <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> altra notifica nel gruppo.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Impostazioni di notifica"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Impostazioni di <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Lo schermo ruoterà automaticamente."</string> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index 087d933de732..2f1393e6b721 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -247,6 +247,12 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"בקשות מיקום פעילות"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"נקה את כל ההתראות."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="two">יש בפנים עוד <xliff:g id="NUMBER_1">%s</xliff:g> הודעות.</item> + <item quantity="many">יש בפנים עוד <xliff:g id="NUMBER_1">%s</xliff:g> הודעות.</item> + <item quantity="other">יש בפנים עוד <xliff:g id="NUMBER_1">%s</xliff:g> הודעות.</item> + <item quantity="one">יש בפנים עוד הודעה <xliff:g id="NUMBER_0">%s</xliff:g>.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"הגדרות עבור הודעות"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"הגדרות <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"המסך יסתובב באופן אוטומטי."</string> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index aa27fffd6998..39b9ea79e74b 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -247,6 +247,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"現在地リクエストがアクティブ"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"通知をすべて消去。"</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"他 <xliff:g id="NUMBER">%s</xliff:g> 件"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other">他 <xliff:g id="NUMBER_1">%s</xliff:g> 件の通知</item> + <item quantity="one">他 <xliff:g id="NUMBER_0">%s</xliff:g> 件の通知</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"通知設定"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g>の設定"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"画面は自動的に回転します。"</string> diff --git a/packages/SystemUI/res/values-ka-rGE/strings.xml b/packages/SystemUI/res/values-ka-rGE/strings.xml index 24fc4a1f00d7..378b36c0b89a 100644 --- a/packages/SystemUI/res/values-ka-rGE/strings.xml +++ b/packages/SystemUI/res/values-ka-rGE/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"მდებარეობის მოთხოვნები აქტიურია"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"ყველა შეტყობინების წაშლა"</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other">კიდევ <xliff:g id="NUMBER_1">%s</xliff:g> შეტყობინება ჯგუფში.</item> + <item quantity="one">კიდევ <xliff:g id="NUMBER_0">%s</xliff:g> შეტყობინება ჯგუფში.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"შეტყობინების პარამეტრები"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> პარამეტრები"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"ეკრანი შეტრიალდება ავტომატურად."</string> diff --git a/packages/SystemUI/res/values-kk-rKZ/strings.xml b/packages/SystemUI/res/values-kk-rKZ/strings.xml index c91e8a53ad53..1e1544bc9d73 100644 --- a/packages/SystemUI/res/values-kk-rKZ/strings.xml +++ b/packages/SystemUI/res/values-kk-rKZ/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Орын өтініштері қосылған"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Барлық хабарларды жойыңыз."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other">Ішінде тағы <xliff:g id="NUMBER_1">%s</xliff:g> хабарландыру.</item> + <item quantity="one">Ішінде тағы <xliff:g id="NUMBER_0">%s</xliff:g> хабарландыру.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Хабарландыру параметрлері"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> параметрлері"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Экран автоматты түрде бұрылады."</string> @@ -377,8 +381,8 @@ <string name="user_logout_notification_title" msgid="1453960926437240727">"Пайдаланушыны шығару"</string> <string name="user_logout_notification_text" msgid="3350262809611876284">"Ағымдағы пайдаланушыны шығару"</string> <string name="user_logout_notification_action" msgid="1195428991423425062">"ПАЙДАЛАНУШЫНЫ ШЫҒАРУ"</string> - <string name="user_add_user_title" msgid="4553596395824132638">"Жаңа пайд-ны қосу керек пе?"</string> - <string name="user_add_user_message_short" msgid="2161624834066214559">"Жаңа пайдаланушыны қосқанда сол адам өз кеңістігін реттеуі керек.\n\nКез келген пайдаланушы барлық басқа пайдаланушылар үшін қолданбаларды жаңарта алады."</string> + <string name="user_add_user_title" msgid="4553596395824132638">"Жаңа пайдаланушы қосылсын ба?"</string> + <string name="user_add_user_message_short" msgid="2161624834066214559">"Жаңа пайдаланушыны қосқанда, сол адам өз кеңістігін реттеуі керек.\n\nКез келген пайдаланушы барлық басқа пайдаланушылар үшін қолданбаларды жаңарта алады."</string> <string name="user_remove_user_title" msgid="4681256956076895559">"Пайдаланушы жойылсын ба?"</string> <string name="user_remove_user_message" msgid="1453218013959498039">"Осы пайдаланушының барлық қолданбалары мен деректері жойылады."</string> <string name="user_remove_user_remove" msgid="7479275741742178297">"Жою"</string> @@ -570,7 +574,7 @@ <string name="headset" msgid="4534219457597457353">"Құлақаспап жинағы"</string> <string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Құлақаспап қосылды"</string> <string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Құлақаспап жинағы қосылды"</string> - <string name="data_saver" msgid="5037565123367048522">"Дерек сақтағыш"</string> + <string name="data_saver" msgid="5037565123367048522">"Трафикті үнемдеу"</string> <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Дерек сақтағыш қосулы"</string> <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Дерек сақтағышы өшірулі"</string> <string name="switch_bar_on" msgid="1142437840752794229">"Қосулы"</string> @@ -595,8 +599,8 @@ <string name="keycode_description" msgid="1403795192716828949">"Кілт коды түймелері пернетақта пернелерін шарлау тақтасына қосуға мүмкіндік береді. Басқан кезде олар таңдалған пернетақта пернесін эмуляциялайды. Алдымен түйме үшін пернені, содан кейін түймеде көрсетілетін кескінді таңдау керек."</string> <string name="select_keycode" msgid="7413765103381924584">"Пернетақта түймесін таңдау"</string> <string name="preview" msgid="9077832302472282938">"Алдын ала қарау"</string> - <string name="drag_to_add_tiles" msgid="7058945779098711293">"Торлар қосу үшін сүйреңіз"</string> - <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Жою үшін осы жерге сүйреңіз"</string> + <string name="drag_to_add_tiles" msgid="7058945779098711293">"Қажеттерін сүйреп қойыңыз"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Керексіздерін осы жерге сүйреңіз"</string> <string name="qs_edit" msgid="2232596095725105230">"Өңдеу"</string> <string name="tuner_time" msgid="6572217313285536011">"Уақыт"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-km-rKH/strings.xml b/packages/SystemUI/res/values-km-rKH/strings.xml index 57da1574078b..84d3470f502f 100644 --- a/packages/SystemUI/res/values-km-rKH/strings.xml +++ b/packages/SystemUI/res/values-km-rKH/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"សំណើទីតាំងសកម្ម"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"សម្អាតការជូនដំណឹងទាំងអស់។"</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other">មានការជូនដំណឹង <xliff:g id="NUMBER_1">%s</xliff:g> ទៀតនៅខាងក្នុង</item> + <item quantity="one">មានការជូនដំណឹង <xliff:g id="NUMBER_0">%s</xliff:g> ទៀតនៅខាងក្នុង</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"កំណត់ការជូនដំណឹង"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"ការកំណត់ <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"នឹងបង្វិលអេក្រង់ស្វ័យប្រវត្តិ។"</string> @@ -320,7 +324,7 @@ <string name="recents_search_bar_label" msgid="8074997400187836677">"ស្វែងរក"</string> <string name="recents_launch_error_message" msgid="2969287838120550506">"មិនអាចចាប់ផ្ដើម <xliff:g id="APP">%s</xliff:g> ទេ។"</string> <string name="recents_launch_disabled_message" msgid="1624523193008871793">"<xliff:g id="APP">%s</xliff:g> ត្រូវបានបិទដំណើរការក្នុងរបៀបសុវត្ថិភាព"</string> - <string name="recents_stack_action_button_label" msgid="6593727103310426253">"ជម្រះទាំងអស់"</string> + <string name="recents_stack_action_button_label" msgid="6593727103310426253">"សម្អាតទាំងអស់"</string> <string name="recents_incompatible_app_message" msgid="5075812958564082451">"កម្មវិធីមិនគាំទ្រអេក្រង់បំបែកជាពីរទេ"</string> <string name="recents_drag_hint_message" msgid="2649739267073203985">"អូសនៅទីនេះដើម្បីប្រើអេក្រង់បំបែក"</string> <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"បំបែកផ្តេក"</string> @@ -595,7 +599,7 @@ <string name="keycode_description" msgid="1403795192716828949">"ប៊ូតុងលេខកូដគ្រាប់ចុចអនុញ្ញាតឲ្យមានការបន្ថែមគ្រាប់ចុចនៃក្តារចុចទៅក្នុងរបាររុករក។ នៅពេលចុចប៊ូតុងទាំងនោះ ពួកវាបង្កើតមុខងារឲ្យគ្រាប់ចុចនៃក្តារចុចដែលបានជ្រើស។ សូមជ្រើសរើសគ្រាប់ចុចសម្រាប់ប៊ូតុងជាមុនសិន មុនពេលដែលរូបភាពត្រូវបានបង្ហាញនៅលើប៊ូតុង។"</string> <string name="select_keycode" msgid="7413765103381924584">"ជ្រើសប៊ូតុងក្តារចុច"</string> <string name="preview" msgid="9077832302472282938">"មើលជាមុន"</string> - <string name="drag_to_add_tiles" msgid="7058945779098711293">"អូសដើម្បីបន្ថែមចំណងជើង"</string> + <string name="drag_to_add_tiles" msgid="7058945779098711293">"អូសដើម្បីបន្ថែមប្រអប់"</string> <string name="drag_to_remove_tiles" msgid="3361212377437088062">"អូសទីនេះដើម្បីយកចេញ"</string> <string name="qs_edit" msgid="2232596095725105230">"កែសម្រួល"</string> <string name="tuner_time" msgid="6572217313285536011">"ម៉ោង"</string> diff --git a/packages/SystemUI/res/values-kn-rIN/strings.xml b/packages/SystemUI/res/values-kn-rIN/strings.xml index 1c295e6dc32f..ed48bcbd9489 100644 --- a/packages/SystemUI/res/values-kn-rIN/strings.xml +++ b/packages/SystemUI/res/values-kn-rIN/strings.xml @@ -43,7 +43,7 @@ <string name="battery_saver_confirmation_ok" msgid="7507968430447930257">"ಆನ್ ಮಾಡು"</string> <string name="battery_saver_start_action" msgid="5576697451677486320">"ಬ್ಯಾಟರಿ ಉಳಿತಾಯವನ್ನು ಆನ್ ಮಾಡಿ"</string> <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"ಸೆಟ್ಟಿಂಗ್ಗಳು"</string> - <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string> + <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"ವೈ-ಫೈ"</string> <string name="status_bar_settings_auto_rotation" msgid="3790482541357798421">"ಪರದೆಯನ್ನು ಸ್ವಯಂ-ತಿರುಗಿಸಿ"</string> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"ಮ್ಯೂಟ್"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"ಸ್ವಯಂ"</string> @@ -58,8 +58,8 @@ <string name="usb_accessory_uri_prompt" msgid="513450621413733343">"ಆಪ್ಗಳು USB ಪರಿಕರದಲ್ಲಿ ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ. ಆ ಬಗ್ಗೆ <xliff:g id="URL">%1$s</xliff:g> ನಲ್ಲಿ ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ"</string> <string name="title_usb_accessory" msgid="4966265263465181372">"USB ಪರಿಕರ"</string> <string name="label_view" msgid="6304565553218192990">"ವೀಕ್ಷಿಸು"</string> - <string name="always_use_device" msgid="1450287437017315906">"ಈ USB ಪರಿಕರಕ್ಕಾಗಿ ಡೀಫಾಲ್ಟ್ ಆಗಿ ಬಳಸಿ"</string> - <string name="always_use_accessory" msgid="1210954576979621596">"ಈ USB ಪರಿಕರಕ್ಕಾಗಿ ಡೀಫಾಲ್ಟ್ ಆಗಿ ಬಳಸಿ"</string> + <string name="always_use_device" msgid="1450287437017315906">"ಈ USB ಪರಿಕರಕ್ಕಾಗಿ ಡಿಫಾಲ್ಟ್ ಆಗಿ ಬಳಸಿ"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"ಈ USB ಪರಿಕರಕ್ಕಾಗಿ ಡಿಫಾಲ್ಟ್ ಆಗಿ ಬಳಸಿ"</string> <string name="usb_debugging_title" msgid="4513918393387141949">"USB ಡೀಬಗ್ ಮಾಡುವಿಕೆಯನ್ನು ಅನುಮತಿಸುವುದೇ?"</string> <string name="usb_debugging_message" msgid="2220143855912376496">"ಕಂಪ್ಯೂಟರ್ನ RSA ಕೀ ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಹೀಗಿದೆ :\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string> <string name="usb_debugging_always" msgid="303335496705863070">"ಈ ಕಂಪ್ಯೂಟರ್ನಿಂದ ಯಾವಾಗಲೂ ಅನುಮತಿಸಿ"</string> @@ -90,7 +90,7 @@ <string name="accessibility_voice_assist_button" msgid="487611083884852965">"ಧ್ವನಿ ಸಹಾಯಕ"</string> <string name="accessibility_unlock_button" msgid="128158454631118828">"ಅನ್ಲಾಕ್"</string> <string name="accessibility_unlock_button_fingerprint" msgid="8214125623493923751">"ಅನ್ಲಾಕ್ ಬಟನ್, ಫಿಂಗರ್ಪ್ರಿಂಟ್ಗೆ ಕಾಯಲಾಗುತ್ತಿದೆ"</string> - <string name="accessibility_unlock_without_fingerprint" msgid="7541705575183694446">"ನಿಮ್ಮ ಫಿಂಗರ್ಪ್ರಿಂಟ್ ಬಳಸದೆಯೇ ಅನ್ಲಾಕ್ ಮಾಡಿ"</string> + <string name="accessibility_unlock_without_fingerprint" msgid="7541705575183694446">"ನಿಮ್ಮ ಬೆರಳಚ್ಚು ಬಳಸದೆಯೇ ಅನ್ಲಾಕ್ ಮಾಡಿ"</string> <string name="unlock_label" msgid="8779712358041029439">"ಅನ್ಲಾಕ್ ಮಾಡು"</string> <string name="phone_label" msgid="2320074140205331708">"ಫೋನ್ ತೆರೆಯಿರಿ"</string> <string name="voice_assist_label" msgid="3956854378310019854">"ಧ್ವನಿ ಸಹಾಯಕವನ್ನು ತೆರೆ"</string> @@ -147,7 +147,7 @@ <string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string> <string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"ರೋಮಿಂಗ್"</string> <string name="accessibility_data_connection_edge" msgid="4477457051631979278">"ಎಡ್ಜ್"</string> - <string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string> + <string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"ವೈ-ಫೈ"</string> <string name="accessibility_no_sim" msgid="8274017118472455155">"ಯಾವುದೇ ಸಿಮ್ ಇಲ್ಲ."</string> <string name="accessibility_cell_data" msgid="7080312242791850520">"ಸೆಲ್ಯುಲರ್ ಡೇಟಾ"</string> <string name="accessibility_cell_data_on" msgid="4310018593519761767">"ಸೆಲ್ಯುಲರ್ ಡೇಟಾ ಆನ್ ಆಗಿದೆ"</string> @@ -211,7 +211,7 @@ <string name="accessibility_quick_settings_location_on" msgid="5809937096590102036">"ಸ್ಥಳ ವರದಿಮಾಡುವಿಕೆಯು ಆನ್ ಆಗಿದೆ."</string> <string name="accessibility_quick_settings_location_changed_off" msgid="8526845571503387376">"ಸ್ಥಳ ವರದಿಮಾಡುವಿಕೆಯನ್ನು ಆಫ್ ಮಾಡಲಾಗಿದೆ."</string> <string name="accessibility_quick_settings_location_changed_on" msgid="339403053079338468">"ಸ್ಥಳ ವರದಿಮಾಡುವಿಕೆಯನ್ನು ಆನ್ ಮಾಡಲಾಗಿದೆ."</string> - <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"<xliff:g id="TIME">%s</xliff:g> ಗಂಟೆಗೆ ಅಲಾರಂ ಹೊಂದಿಸಲಾಗಿದೆ."</string> + <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"<xliff:g id="TIME">%s</xliff:g> ಗಂಟೆಗೆ ಅಲಾರಮ್ ಹೊಂದಿಸಲಾಗಿದೆ."</string> <string name="accessibility_quick_settings_close" msgid="3115847794692516306">"ಪ್ಯಾನಲ್ ಮುಚ್ಚಿ."</string> <string name="accessibility_quick_settings_more_time" msgid="3659274935356197708">"ಹೆಚ್ಚು ಸಮಯ."</string> <string name="accessibility_quick_settings_less_time" msgid="2404728746293515623">"ಕಡಿಮೆ ಸಮಯ."</string> @@ -239,12 +239,16 @@ <string name="data_usage_disabled_dialog" msgid="8453242888903772524">"ಏಕೆಂದರೆ ನಿಮ್ಮ ಹೊಂದಾಣಿಕೆ ಡೇಟಾ ಮೀತಿಯನ್ನು ತಲುಪಿದೆ, ಈ ಆವರ್ತನೆಯ ಉಳಿದ ಭಾಗಕ್ಕೆ ಸಾಧನವು ಡೇಟಾ ಬಳಕೆಯನ್ನು ವಿರಾಮಗೊಳಿಸಿದೆ.\n\nಮುಂದುವರೆಯುವಿಕೆಯು ನಿಮ್ಮ ವಾಹಕದ ಶುಲ್ಕಗಳಿಗೆ ಕಾರಣವಾಗಬಹುದು."</string> <string name="data_usage_disabled_dialog_enable" msgid="1412395410306390593">"ಮುಂದುವರಿಸು"</string> <string name="status_bar_settings_signal_meter_disconnected" msgid="1940231521274147771">"ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವಿಲ್ಲ"</string> - <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="6557486452774597820">"Wi-Fi ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string> + <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="6557486452774597820">"ವೈ-ಫೈ ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string> <string name="gps_notification_searching_text" msgid="8574247005642736060">"GPS ಗಾಗಿ ಹುಡುಕಲಾಗುತ್ತಿದೆ"</string> <string name="gps_notification_found_text" msgid="4619274244146446464">"ಸ್ಥಾನವನ್ನು GPS ಮೂಲಕ ಹೊಂದಿಸಲಾಗಿದೆ"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"ಸ್ಥಾನ ವಿನಂತಿಗಳು ಸಕ್ರಿಯವಾಗಿವೆ"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"ಎಲ್ಲಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ತೆರವುಗೊಳಿಸು."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="one"><xliff:g id="NUMBER_1">%s</xliff:g> ಕ್ಕಿಂತ ಹೆಚ್ಚು ಅಧಿಸೂಚನೆಗಳು ಒಳಗಿವೆ.</item> + <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> ಕ್ಕಿಂತ ಹೆಚ್ಚು ಅಧಿಸೂಚನೆಗಳು ಒಳಗಿವೆ.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"ಅಧಿಸೂಚನೆ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> ಸೆಟ್ಟಿಂಗ್ಗಳು"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"ಪರದೆಯು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ತಿರುಗುತ್ತದೆ."</string> @@ -282,10 +286,10 @@ <string name="quick_settings_user_label" msgid="5238995632130897840">"ನಾನು"</string> <string name="quick_settings_user_title" msgid="4467690427642392403">"ಬಳಕೆದಾರ"</string> <string name="quick_settings_user_new_user" msgid="9030521362023479778">"ಹೊಸ ಬಳಕೆದಾರರು"</string> - <string name="quick_settings_wifi_label" msgid="9135344704899546041">"Wi-Fi"</string> + <string name="quick_settings_wifi_label" msgid="9135344704899546041">"ವೈ-ಫೈ"</string> <string name="quick_settings_wifi_not_connected" msgid="7171904845345573431">"ಸಂಪರ್ಕಗೊಂಡಿಲ್ಲ"</string> <string name="quick_settings_wifi_no_network" msgid="2221993077220856376">"ನೆಟ್ವರ್ಕ್ ಇಲ್ಲ"</string> - <string name="quick_settings_wifi_off_label" msgid="7558778100843885864">"Wi-Fi ಆಫ್"</string> + <string name="quick_settings_wifi_off_label" msgid="7558778100843885864">"ವೈ-ಫೈ ಆಫ್"</string> <string name="quick_settings_wifi_on_label" msgid="7607810331387031235">"ವೈ-ಫೈ ಆನ್ ಆಗಿದೆ"</string> <string name="quick_settings_wifi_detail_empty_text" msgid="269990350383909226">"ಯಾವುದೇ ವೈ-ಫೈ ನೆಟ್ವರ್ಕ್ಗಳು ಲಭ್ಯವಿಲ್ಲ"</string> <string name="quick_settings_cast_title" msgid="7709016546426454729">"ಬಿತ್ತರಿಸುವಿಕೆ"</string> @@ -320,7 +324,7 @@ <string name="recents_search_bar_label" msgid="8074997400187836677">"ಹುಡುಕಾಟ"</string> <string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> ಪ್ರಾರಂಭಿಸಲು ಸಾದ್ಯವಿಲ್ಲ."</string> <string name="recents_launch_disabled_message" msgid="1624523193008871793">"<xliff:g id="APP">%s</xliff:g> ಅನ್ನು ಸುರಕ್ಷಿತ ಮೋಡ್ನಲ್ಲಿ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ."</string> - <string name="recents_stack_action_button_label" msgid="6593727103310426253">"ಎಲ್ಲವನ್ನೂ ತೆರವುಗೊಳಿಸು"</string> + <string name="recents_stack_action_button_label" msgid="6593727103310426253">"ಎಲ್ಲವನ್ನೂ ತೆರವುಗೊಳಿಸಿ"</string> <string name="recents_incompatible_app_message" msgid="5075812958564082451">"ವಿಭಜಿತ ಪರದೆಯನ್ನು ಅಪ್ಲಿಕೇಶನ್ ಬೆಂಬಲಿಸುವುದಿಲ್ಲ"</string> <string name="recents_drag_hint_message" msgid="2649739267073203985">"ವಿಭಜಿತ ಪರದೆಯನ್ನು ಬಳಸಲು ಇಲ್ಲಿ ಡ್ರ್ಯಾಗ್ ಮಾಡಿ"</string> <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"ಅಡ್ಡಲಾಗಿ ವಿಭಜಿಸಿದ"</string> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index 9eba95604edb..5c46e00a3f10 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -247,6 +247,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"위치 요청 있음"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"모든 알림 지우기"</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"<xliff:g id="NUMBER">%s</xliff:g>개 더보기"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g>개 알림 더보기</item> + <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g>개 알림 더보기</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"알림 설정"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> 설정"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"화면이 자동으로 회전됩니다."</string> diff --git a/packages/SystemUI/res/values-ky-rKG/strings.xml b/packages/SystemUI/res/values-ky-rKG/strings.xml index 1dd663649052..fa4800ee0f18 100644 --- a/packages/SystemUI/res/values-ky-rKG/strings.xml +++ b/packages/SystemUI/res/values-ky-rKG/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Жайгаштыруу талаптары иштелүүдө"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Бардык эскертмелерди тазалоо."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other">Ичинде дагы <xliff:g id="NUMBER_1">%s</xliff:g> эскертме бар.</item> + <item quantity="one">Ичинде дагы <xliff:g id="NUMBER_0">%s</xliff:g> эскертме бар.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Эскертме жөндөөлөрү"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> жөндөөлөрү"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Экран автоматтык түрдө бурулат."</string> @@ -295,7 +299,7 @@ <string name="quick_settings_cast_detail_empty_text" msgid="311785821261640623">"Жеткиликтүү түзмөктөр жок"</string> <string name="quick_settings_brightness_dialog_title" msgid="8599674057673605368">"Жарыктыгы"</string> <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"АВТО"</string> - <string name="quick_settings_inversion_label" msgid="8790919884718619648">"Түстөрдү аңтаруу"</string> + <string name="quick_settings_inversion_label" msgid="8790919884718619648">"Түстөрдү инверсиялоо"</string> <string name="quick_settings_color_space_label" msgid="853443689745584770">"Түстү тууралоо абалы"</string> <string name="quick_settings_more_settings" msgid="326112621462813682">"Дагы жөндөөлөр"</string> <string name="quick_settings_done" msgid="3402999958839153376">"Бүттү"</string> diff --git a/packages/SystemUI/res/values-lo-rLA/strings.xml b/packages/SystemUI/res/values-lo-rLA/strings.xml index 4fd8485eff0c..f8aea2619d4f 100644 --- a/packages/SystemUI/res/values-lo-rLA/strings.xml +++ b/packages/SystemUI/res/values-lo-rLA/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"ການຮ້ອງຂໍສະຖານທີ່ທີ່ເຮັດວຽກຢູ່"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"ລຶບການແຈ້ງເຕືອນທັງໝົດ."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other">ມີ <xliff:g id="NUMBER_1">%s</xliff:g> ການແຈ້ງເຕືອນເພີ່ມເຕີມຢູ່ທາງໃນ.</item> + <item quantity="one">ມີ <xliff:g id="NUMBER_0">%s</xliff:g> ການແຈ້ງເຕືອນເພີ່ມເຕີມຢູ່ທາງໃນ.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"ການຕັ້ງຄ່າການແຈ້ງເຕືອນ"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"ການຕັ້ງຄ່າ <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"ໜ້າຈໍຈະໝຸນໂດຍອັດຕະໂນມັດ."</string> @@ -377,7 +381,7 @@ <string name="user_logout_notification_title" msgid="1453960926437240727">"ເອົາຜູ້ໃຊ້ອອກຈາກລະບົບ"</string> <string name="user_logout_notification_text" msgid="3350262809611876284">"ອອກຈາກຜູ້ໃຊ້ປະຈຸບັນ"</string> <string name="user_logout_notification_action" msgid="1195428991423425062">"ເອົາຜູ້ໃຊ້ອອກຈາກລະບົບ"</string> - <string name="user_add_user_title" msgid="4553596395824132638">"ເພີ່ມຜູ່ໃຊ້ໃໝ່ບໍ?"</string> + <string name="user_add_user_title" msgid="4553596395824132638">"ເພີ່ມຜູ້ໃຊ້ໃໝ່ບໍ?"</string> <string name="user_add_user_message_short" msgid="2161624834066214559">"ເມື່ອທ່ານເພີ່ມຜູ້ໃຊ້ໃໝ່, ຜູ້ໃຊ້ນັ້ນຈະຕ້ອງຕັ້ງຄ່າພື້ນທີ່ບ່ອນຈັດເກັບຂໍ້ມູນຂອງລາວ.\n\nຜູ້ໃຊ້ທຸກຄົນສາມາດອັບເດດແອັບຯຂອງຜູ້ໃຊ້ຄົນອື່ນທັງໝົດໄດ້."</string> <string name="user_remove_user_title" msgid="4681256956076895559">"ລຶບຜູ້ໃຊ້ອອກບໍ?"</string> <string name="user_remove_user_message" msgid="1453218013959498039">"ທຸກແອັບ ແລະ ຂໍ້ມູນຂອງຜູ້ໃຊ້ນີ້ຈະຖືກລຶບ."</string> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index 72af899d1ede..a40bef9b3d74 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -247,6 +247,12 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Vietovės užklausos aktyvios"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Išvalyti visus pranešimus."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"Dar <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="one">Grupėje yra dar <xliff:g id="NUMBER_1">%s</xliff:g> pranešimas.</item> + <item quantity="few">Grupėje yra dar <xliff:g id="NUMBER_1">%s</xliff:g> pranešimai.</item> + <item quantity="many">Grupėje yra dar <xliff:g id="NUMBER_1">%s</xliff:g> pranešimo.</item> + <item quantity="other">Grupėje yra dar <xliff:g id="NUMBER_1">%s</xliff:g> pranešimų.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Pranešimų nustatymai"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"„<xliff:g id="APP_NAME">%s</xliff:g>“ nustatymai"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Ekranas bus sukamas automatiškai."</string> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index 27542686f763..d5b29c4105de 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -246,6 +246,11 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Aktīvi atrašanās vietu pieprasījumi"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Notīrīt visus paziņojumus"</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"vēl <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="zero">Vēl <xliff:g id="NUMBER_1">%s</xliff:g> paziņojumi grupā.</item> + <item quantity="one">Vēl <xliff:g id="NUMBER_1">%s</xliff:g> paziņojums grupā.</item> + <item quantity="other">Vēl <xliff:g id="NUMBER_1">%s</xliff:g> paziņojumi grupā.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Paziņojumu iestatījumi"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> iestatījumi"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Ekrāns tiks pagriezts automātiski."</string> diff --git a/packages/SystemUI/res/values-mk-rMK/strings.xml b/packages/SystemUI/res/values-mk-rMK/strings.xml index 8f0e3ab6440c..f4dd7bc00074 100644 --- a/packages/SystemUI/res/values-mk-rMK/strings.xml +++ b/packages/SystemUI/res/values-mk-rMK/strings.xml @@ -149,7 +149,7 @@ <string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string> <string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string> <string name="accessibility_no_sim" msgid="8274017118472455155">"Нема СИМ картичка."</string> - <string name="accessibility_cell_data" msgid="7080312242791850520">"Мобилни податоци"</string> + <string name="accessibility_cell_data" msgid="7080312242791850520">"Мобилен интернет"</string> <string name="accessibility_cell_data_on" msgid="4310018593519761767">"Вклучени се мобилните податоци"</string> <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Мобилните податоци се исклучени"</string> <string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Се поврзува со Bluetooth."</string> @@ -162,8 +162,8 @@ <string name="accessibility_settings_button" msgid="799583911231893380">"Поставки на систем."</string> <string name="accessibility_notifications_button" msgid="4498000369779421892">"Известувања"</string> <string name="accessibility_remove_notification" msgid="3603099514902182350">"Избриши известување."</string> - <string name="accessibility_gps_enabled" msgid="3511469499240123019">"ГПС е овозможен."</string> - <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Се добива ГПС..."</string> + <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS е овозможен."</string> + <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Се добива GPS..."</string> <string name="accessibility_tty_enabled" msgid="4613200365379426561">"Овозможен е телепринтер."</string> <string name="accessibility_ringer_vibrate" msgid="666585363364155055">"Ѕвонче на вибрации."</string> <string name="accessibility_ringer_silent" msgid="9061243307939135383">"Ѕвонче на тивко."</string> @@ -240,11 +240,15 @@ <string name="data_usage_disabled_dialog_enable" msgid="1412395410306390593">"Продолжи"</string> <string name="status_bar_settings_signal_meter_disconnected" msgid="1940231521274147771">"Нема интернет"</string> <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="6557486452774597820">"Поврзано на Wi-Fi"</string> - <string name="gps_notification_searching_text" msgid="8574247005642736060">"Се пребарува за ГПС"</string> - <string name="gps_notification_found_text" msgid="4619274244146446464">"Локацијата е поставена со ГПС"</string> + <string name="gps_notification_searching_text" msgid="8574247005642736060">"Се пребарува за GPS"</string> + <string name="gps_notification_found_text" msgid="4619274244146446464">"Локацијата е поставена со GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Активни барања за локација"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Исчисти ги сите известувања."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="one">Уште <xliff:g id="NUMBER_1">%s</xliff:g> известување внатре.</item> + <item quantity="other">Уште <xliff:g id="NUMBER_1">%s</xliff:g> известувања внатре.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Поставки на известувања"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Поставки на <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Екранот ќе ротира автоматски."</string> @@ -305,7 +309,7 @@ <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Точка на пристап"</string> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Известувања"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Светилка"</string> - <string name="quick_settings_cellular_detail_title" msgid="8575062783675171695">"Мобилни податоци"</string> + <string name="quick_settings_cellular_detail_title" msgid="8575062783675171695">"Мобилен интернет"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Потрошен интернет"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Преостанати податоци"</string> <string name="quick_settings_cellular_detail_over_limit" msgid="967669665390990427">"Над лимитот"</string> diff --git a/packages/SystemUI/res/values-ml-rIN/strings.xml b/packages/SystemUI/res/values-ml-rIN/strings.xml index 8631fd574b41..7178b298fc25 100644 --- a/packages/SystemUI/res/values-ml-rIN/strings.xml +++ b/packages/SystemUI/res/values-ml-rIN/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"ലൊക്കേഷൻ അഭ്യർത്ഥനകൾ സജീവമാണ്"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"എല്ലാ വിവരങ്ങളും മായ്ക്കുക."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other">ഉള്ളിൽ <xliff:g id="NUMBER_1">%s</xliff:g> അറിയിപ്പുകൾ കൂടിയുണ്ട്.</item> + <item quantity="one">ഉള്ളിൽ <xliff:g id="NUMBER_0">%s</xliff:g> അറിയിപ്പ് കൂടിയുണ്ട്.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"അറിയിപ്പ് ക്രമീകരണങ്ങൾ"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> ക്രമീകരണം"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"സ്ക്രീൻ സ്വയമേവ തിരിയും."</string> @@ -326,7 +330,7 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"തിരശ്ചീനമായി വേർതിരിക്കുക"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"ലംബമായി വേർതിരിക്കുക"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"ഇഷ്ടാനുസൃതമായി വേർതിരിക്കുക"</string> - <string name="expanded_header_battery_charged" msgid="5945855970267657951">"ചാർജ്ജുചെയ്തു"</string> + <string name="expanded_header_battery_charged" msgid="5945855970267657951">"ചാർജായി"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"ചാർജ്ജുചെയ്യുന്നു"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"പൂർണ്ണമായും ചാർജ്ജാകുന്നതിന്, <xliff:g id="CHARGING_TIME">%s</xliff:g>"</string> <string name="expanded_header_battery_not_charging" msgid="4798147152367049732">"ചാർജ്ജുചെയ്യുന്നില്ല"</string> @@ -334,7 +338,7 @@ <string name="description_target_search" msgid="3091587249776033139">"തിരയൽ"</string> <string name="description_direction_up" msgid="7169032478259485180">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> എന്നതിനായി മുകളിലേയ്ക്ക് സ്ലൈഡുചെയ്യുക."</string> <string name="description_direction_left" msgid="7207478719805562165">"<xliff:g id="TARGET_DESCRIPTION">%s</xliff:g> എന്നതിനായി ഇടത്തേയ്ക്ക് സ്ലൈഡുചെയ്യുക."</string> - <string name="zen_priority_introduction" msgid="3070506961866919502">"നിങ്ങൾ വ്യക്തമാക്കിയിട്ടുള്ള അലാറങ്ങൾ, ഓർമ്മപ്പെടുത്തലുകൾ, ഇവന്റുകൾ, കോളർമാർ എന്നിവ ഒഴികെയുള്ള ശബ്ദങ്ങളോ വൈബ്രേഷനുകളോ കാരണം നിങ്ങൾക്ക് ശല്യമുണ്ടാകില്ല."</string> + <string name="zen_priority_introduction" msgid="3070506961866919502">"നിങ്ങൾ വ്യക്തമാക്കിയിട്ടുള്ള അലാറങ്ങൾ, റിമൈൻഡറുകൾ, ഇവന്റുകൾ, കോളർമാർ എന്നിവ ഒഴികെയുള്ള ശബ്ദങ്ങളോ വൈബ്രേഷനുകളോ കാരണം നിങ്ങൾക്ക് ശല്യമുണ്ടാകില്ല."</string> <string name="zen_priority_customize_button" msgid="7948043278226955063">"ഇഷ്ടാനുസൃതമാക്കുക"</string> <string name="zen_silence_introduction_voice" msgid="2284540992298200729">"ഇത് അലാറങ്ങൾ, സംഗീതം, വീഡിയോകൾ, ഗെയിമുകൾ എന്നിവയിൽ നിന്നുൾപ്പെടെ എല്ലാ ശബ്ദങ്ങളും വൈബ്രേഷനുകളും തടയുന്നു. നിങ്ങൾക്ക് തുടർന്നും ഫോൺ വിളിക്കാനാകും."</string> <string name="zen_silence_introduction" msgid="3137882381093271568">"ഇത് അലാറങ്ങൾ, സംഗീതം, വീഡിയോകൾ, ഗെയിമുകൾ എന്നിവയിൽ നിന്നുൾപ്പെടെ എല്ലാ ശബ്ദങ്ങളും വൈബ്രേഷനുകളും തടയുന്നു."</string> diff --git a/packages/SystemUI/res/values-mn-rMN/strings.xml b/packages/SystemUI/res/values-mn-rMN/strings.xml index 278468afeb42..296658bd3dfd 100644 --- a/packages/SystemUI/res/values-mn-rMN/strings.xml +++ b/packages/SystemUI/res/values-mn-rMN/strings.xml @@ -243,6 +243,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Байршлын хүсэлтүүд идэвхтэй"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Бүх мэдэгдлийг цэвэрлэх."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other">дотор бусад <xliff:g id="NUMBER_1">%s</xliff:g> мэдэгдэл байна.</item> + <item quantity="one">дотор бусад <xliff:g id="NUMBER_0">%s</xliff:g> мэдэгдэл байна.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Мэдэгдлийн тохиргоо"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> тохиргоо"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Дэлгэц автоматаар эргэнэ."</string> diff --git a/packages/SystemUI/res/values-mr-rIN/strings.xml b/packages/SystemUI/res/values-mr-rIN/strings.xml index 3aef30befbd4..1fb4beb1e14f 100644 --- a/packages/SystemUI/res/values-mr-rIN/strings.xml +++ b/packages/SystemUI/res/values-mr-rIN/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"स्थान विनंत्या सक्रिय"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"सर्व सूचना साफ करा."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="one">आत आणखी <xliff:g id="NUMBER_1">%s</xliff:g> सूचना.</item> + <item quantity="other">आत आणखी <xliff:g id="NUMBER_1">%s</xliff:g> सूचना.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"सूचना सेटिंग्ज"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> सेटिंग्ज"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"स्क्रीन स्वयंचलितपणे फिरेल."</string> diff --git a/packages/SystemUI/res/values-ms-rMY/strings.xml b/packages/SystemUI/res/values-ms-rMY/strings.xml index 3c3e7a50335b..8729ae86d2bd 100644 --- a/packages/SystemUI/res/values-ms-rMY/strings.xml +++ b/packages/SystemUI/res/values-ms-rMY/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Permintaan lokasi aktif"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Padamkan semua pemberitahuan."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> lagi pemberitahuan di dalam.</item> + <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> lagi pemberitahuan di dalam.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Tetapan pemberitahuan"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> tetapan"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Skrin akan berputar secara automatik."</string> diff --git a/packages/SystemUI/res/values-my-rMM/strings.xml b/packages/SystemUI/res/values-my-rMM/strings.xml index 15a5fbf49426..2522e39aa7bb 100644 --- a/packages/SystemUI/res/values-my-rMM/strings.xml +++ b/packages/SystemUI/res/values-my-rMM/strings.xml @@ -20,7 +20,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_label" msgid="7164937344850004466">"စနစ်၏UI"</string> - <string name="status_bar_clear_all_button" msgid="7774721344716731603">"ရှင်းလင်းရန်"</string> + <string name="status_bar_clear_all_button" msgid="7774721344716731603">"ဖယ်ရှားရန်"</string> <string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"စာရင်းမှ ဖယ်မည်"</string> <string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"အပ်ပလီကေးရှင်း အချက်အလက်များ"</string> <string name="status_bar_no_recent_apps" msgid="7374907845131203189">"သင်၏ မကြာမီက မျက်နှာပြင်များ ဒီမှာ ပေါ်လာကြမည်"</string> @@ -96,7 +96,7 @@ <string name="voice_assist_label" msgid="3956854378310019854">"အသံ အကူအညီအား ဖွင့်ရန်"</string> <string name="camera_label" msgid="7261107956054836961">"ကင်မရာ ဖွင့်ရန်"</string> <string name="recents_caption_resize" msgid="3517056471774958200">"အလုပ်သစ်စီစဥ်မှုကို ရွေးပါ။"</string> - <string name="cancel" msgid="6442560571259935130">"ဖျက်သိမ်းရန်"</string> + <string name="cancel" msgid="6442560571259935130">"မလုပ်တော့ပါ"</string> <string name="accessibility_compatibility_zoom_button" msgid="8461115318742350699">"အံ့ဝင်သောချုံ့ချဲ့ခလုတ်"</string> <string name="accessibility_compatibility_zoom_example" msgid="4220687294564945780">"ဖန်သားပြင်ပေါ်တွင် အသေးမှအကြီးသို့ချဲ့ခြင်း"</string> <string name="accessibility_bluetooth_connected" msgid="2707027633242983370">"ဘလူးတုသ်ချိတ်ဆက်ထားမှု"</string> @@ -196,7 +196,7 @@ <string name="accessibility_quick_settings_dnd_priority_on" msgid="1448402297221249355">"မနှောင့်ယှက်ပါနှင့် ဖွင့်ထားသည်၊ ဦးစားပေးများသာ။"</string> <string name="accessibility_quick_settings_dnd_none_on" msgid="6882582132662613537">"လုံးဝ တိတ်ဆိတ်နေစဉ်၊ မနှောင့်ယှက်ပါနှင့်။"</string> <string name="accessibility_quick_settings_dnd_alarms_on" msgid="9152834845587554157">"အနှောင့်ယှက်ရ ဖွင့်ထားသည်။ နှိုးစက်များသာ။"</string> - <string name="accessibility_quick_settings_dnd" msgid="6607873236717185815">"မနှောက်ယှက်ရ။"</string> + <string name="accessibility_quick_settings_dnd" msgid="6607873236717185815">"မနှောင့်ယှက်ရ။"</string> <string name="accessibility_quick_settings_dnd_off" msgid="2371832603753738581">"မနှောင့်ယှက်ပါနှင့် ကိုပိတ်ထားသည်။"</string> <string name="accessibility_quick_settings_dnd_changed_off" msgid="898107593453022935">"မနှောင့်ယှက်ပါနှင့် ကိုပိတ်ထားသည်။"</string> <string name="accessibility_quick_settings_dnd_changed_on" msgid="4483780856613561039">"မနှောင့်ယှက်ပါနှင့်ကို ဖွင့်ထားသည်။"</string> @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"တည်နေရာပြ တောင်းဆိုချက်များ အသက်ဝင်ရန်"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"သတိပေးချက်အားလုံးအား ဖယ်ရှားခြင်း။"</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other">အတွင်းတွင် အကြောင်းကြားချက် နောက်ထပ် <xliff:g id="NUMBER_1">%s</xliff:g> ခုရှိပါသည်။</item> + <item quantity="one">အတွင်းတွင် အကြောင်းကြားချက် နောက်ထပ် <xliff:g id="NUMBER_0">%s</xliff:g> ခုရှိပါသည်။</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"အကြောင်းကြားချက် ဆက်တင်များ"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> ဆက်တင်များ"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"ဖန်သားပြင်ပေါ်မှာ ပြသမှုက အလိုအလျောက် လှည့်သွားပါမည်"</string> @@ -252,24 +256,24 @@ <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"ဖန်သားပြင် အနေအထားက ဒေါင်လိုက်အဖြစ် ပုံသေ လုပ်ထားပါသည်"</string> <string name="accessibility_rotation_lock_off_changed" msgid="8134601071026305153">"ယခုတော့ မျက်နှာပြင်သည် အလိုအလျောက် လည်နေမည်။"</string> <string name="accessibility_rotation_lock_on_landscape_changed" msgid="3135965553707519743">"မျက်နှာပြင် အနေအထားကို ဘေးတိုက် အဖြစ် သော့ချထားသည်။"</string> - <string name="accessibility_rotation_lock_on_portrait_changed" msgid="8922481981834012126">"မျက်နှာပြင် အနေအထားကို ဒေါင်လိုက် အဖြစ် သော့ချထားသည်။"</string> + <string name="accessibility_rotation_lock_on_portrait_changed" msgid="8922481981834012126">"မျက်နှာပြင် အနေအထားကို ထောင်လိုက် အဖြစ် သော့ချထားသည်။"</string> <string name="dessert_case" msgid="1295161776223959221">"မုန့်ထည့်သော ပုံး"</string> <string name="start_dreams" msgid="5640361424498338327">"ဖန်သားပြင်အသုံးပြုမှု ချွေတာမှုစနစ်"</string> <string name="ethernet_label" msgid="7967563676324087464">"အီသာနက်"</string> - <string name="quick_settings_dnd_label" msgid="8735855737575028208">"မနှောက်ယှက်ပါနှင့်"</string> + <string name="quick_settings_dnd_label" msgid="8735855737575028208">"မနှောင့်ယှက်ရ"</string> <string name="quick_settings_dnd_priority_label" msgid="483232950670692036">"ဦးစားပေးများသာ"</string> <string name="quick_settings_dnd_alarms_label" msgid="2559229444312445858">"နှိုးစက်များသာ"</string> <string name="quick_settings_dnd_none_label" msgid="5025477807123029478">"လုံးဝ တိတ်ဆိတ်ခြင်း"</string> - <string name="quick_settings_bluetooth_label" msgid="6304190285170721401">"ဘလူးတု"</string> - <string name="quick_settings_bluetooth_multiple_devices_label" msgid="3912245565613684735">"ဘလူးတု (<xliff:g id="NUMBER">%d</xliff:g> စက်များ)"</string> - <string name="quick_settings_bluetooth_off_label" msgid="8159652146149219937">"ဘလူးတု ပိတ်ထားရန်"</string> + <string name="quick_settings_bluetooth_label" msgid="6304190285170721401">"ဘလူးတုသ်"</string> + <string name="quick_settings_bluetooth_multiple_devices_label" msgid="3912245565613684735">"ဘလူးတုသ် (<xliff:g id="NUMBER">%d</xliff:g> စက်များ)"</string> + <string name="quick_settings_bluetooth_off_label" msgid="8159652146149219937">"ဘလူးတုသ် ပိတ်ထားရန်"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="4910015762433302860">"ချိတ်တွဲထားသည့် ကိရိယာများ မရှိ"</string> <string name="quick_settings_brightness_label" msgid="6968372297018755815">"အလင်းတောက်ပမှု"</string> <string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"အော်တို-လည်"</string> <string name="accessibility_quick_settings_rotation" msgid="4231661040698488779">"မျက်နှာပြင်အား အလိုအလျောက်လှည့်ခြင်း"</string> <string name="accessibility_quick_settings_rotation_value" msgid="1428962304214992318">"<xliff:g id="ID_1">%s</xliff:g> သို့သတ်မှတ်ပါ"</string> <string name="quick_settings_rotation_locked_label" msgid="6359205706154282377">"လည်မှု သော့ပိတ်ထား"</string> - <string name="quick_settings_rotation_locked_portrait_label" msgid="5102691921442135053">"ဒေါင်လိုက်"</string> + <string name="quick_settings_rotation_locked_portrait_label" msgid="5102691921442135053">"ထောင်လိုက်"</string> <string name="quick_settings_rotation_locked_landscape_label" msgid="8553157770061178719">"ဘေးတိုက်"</string> <string name="quick_settings_ime_label" msgid="7073463064369468429">"ထည့်သွင်းရန်နည်းလမ်း"</string> <string name="quick_settings_location_label" msgid="5011327048748762257">"တည်နေရာ"</string> @@ -295,7 +299,7 @@ <string name="quick_settings_cast_detail_empty_text" msgid="311785821261640623">"ကိရိယာများ မရှိ"</string> <string name="quick_settings_brightness_dialog_title" msgid="8599674057673605368">"အလင်းတောက်ပမှု"</string> <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"အလိုအလျောက်"</string> - <string name="quick_settings_inversion_label" msgid="8790919884718619648">"အရောင်များကို ပြောင်းပြန် လုပ်ပစ်ရန်"</string> + <string name="quick_settings_inversion_label" msgid="8790919884718619648">"အရောင်များ ပြောင်းပြန်လုပ်ရန်"</string> <string name="quick_settings_color_space_label" msgid="853443689745584770">"အရောင် မှန်ကန်စေခြင်း အခြေအနေ"</string> <string name="quick_settings_more_settings" msgid="326112621462813682">"နောက်ထပ် ဆက်တင်များ"</string> <string name="quick_settings_done" msgid="3402999958839153376">"လုပ်ပြီး"</string> @@ -305,7 +309,7 @@ <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"ဟော့စပေါ့"</string> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"အကြောင်းကြားချက်များ"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"ဖလက်ရှမီး"</string> - <string name="quick_settings_cellular_detail_title" msgid="8575062783675171695">"ဆယ်လူလာ ဒေတာ"</string> + <string name="quick_settings_cellular_detail_title" msgid="8575062783675171695">"ဆဲလ်လူလာ ဒေတာ"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"ဒေတာ သုံးစွဲမှု"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"ကျန်ရှိ ဒေတာ"</string> <string name="quick_settings_cellular_detail_over_limit" msgid="967669665390990427">"ကန့်သတ်ချက် ကျော်လွန်"</string> @@ -320,7 +324,7 @@ <string name="recents_search_bar_label" msgid="8074997400187836677">"ရှာဖွေရန်"</string> <string name="recents_launch_error_message" msgid="2969287838120550506">"<xliff:g id="APP">%s</xliff:g> ကို မစနိုင်ပါ။"</string> <string name="recents_launch_disabled_message" msgid="1624523193008871793">"<xliff:g id="APP">%s</xliff:g> ကို ဘေးကင်းလုံခြုံသည့်မုဒ်တွင် ပိတ်ထားပါသည်။"</string> - <string name="recents_stack_action_button_label" msgid="6593727103310426253">"အားလုံး ရှင်းလင်းပါ"</string> + <string name="recents_stack_action_button_label" msgid="6593727103310426253">"အားလုံး ဖယ်ရှားပါ"</string> <string name="recents_incompatible_app_message" msgid="5075812958564082451">"အက်ပ်သည် မျက်နှာပြင်ခွဲ၍ ပြသခြင်းကို ပံ့ပိုးမထားပါ"</string> <string name="recents_drag_hint_message" msgid="2649739267073203985">"မျက်နှာပြင် ခွဲခြမ်းပြသခြင်းကို အသုံးပြုရန် ဤနေရာသို့ ပွတ်၍ဆွဲထည့်ပါ"</string> <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"ရေပြင်ညီ ပိုင်းမည်"</string> @@ -387,7 +391,7 @@ <string name="battery_saver_notification_action_text" msgid="109158658238110382">"ဘက်ထရီ ချွေတာမှုကို ပိတ်ထားရန်"</string> <string name="media_projection_dialog_text" msgid="3071431025448218928">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> က သင်၏ မျက်နှာပြင် ပေါ်မှာ ပြသထားသည့် အရာတိုင်းကို စတင် ဖမ်းယူမည်။"</string> <string name="media_projection_remember_text" msgid="3103510882172746752">"နောက်ထပ် မပြပါနှင့်"</string> - <string name="clear_all_notifications_text" msgid="814192889771462828">"အားလုံး ရှင်းလင်းရန်"</string> + <string name="clear_all_notifications_text" msgid="814192889771462828">"အားလုံး ဖယ်ရှားရန်"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"ယခု စတင်ပါ"</string> <string name="empty_shade_text" msgid="708135716272867002">"အကြောင်းကြားချက်များ မရှိ"</string> <string name="device_owned_footer" msgid="3802752663326030053">"ကိရိယာကို စောင့်ကြပ် နိုင်ပါသည်"</string> @@ -419,8 +423,8 @@ <string name="accessibility_volume_collapse" msgid="3609549593031810875">"ခေါက်သိမ်းရန်..."</string> <string name="screen_pinning_title" msgid="3273740381976175811">"မျက်နှာပြင် ပင်ထိုးပြီးပါပြီ"</string> <string name="screen_pinning_description" msgid="7238941806855968768">"သင်က ပင်မဖြုတ်မချင်း ၎င်းကိုပြသထားပါမည်။ ပင်ဖြုတ်ရန် \'နောက်သို့\' ကိုထိပြီး ဖိထားပါ။"</string> - <string name="screen_pinning_positive" msgid="3783985798366751226">"အဲဒါ ရပြီ"</string> - <string name="screen_pinning_negative" msgid="3741602308343880268">"မလို ကျေးဇူးပဲ"</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"အဲဒါ ရပါပြီ"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"မလိုတော့ပါ"</string> <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"<xliff:g id="TILE_LABEL">%1$s</xliff:g> ဝှက်မည်လား?"</string> <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"နောက်တစ်ကြိမ်သင် ချိန်ညှိချက်များဖွင့်လျှင် ၎င်းပေါ်လာပါမည်။"</string> <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"ဖျောက်ထားမည်"</string> @@ -436,7 +440,7 @@ <string name="volume_dialog_accessibility_shown_message" msgid="1834631467074259998">"အသံအတိုးအလျှော့ခလုတ် %s ပြသထားပါသည်။ ပယ်ဖျက်ရန် ပွတ်ဆွဲပါ။"</string> <string name="volume_dialog_accessibility_dismissed_message" msgid="51543526013711399">"အသံအတိုးအလျှော့ခလုတ်များကို ဝှက်ထားပါသည်"</string> <string name="system_ui_tuner" msgid="708224127392452018">"စနစ် UI ဖမ်းစက်"</string> - <string name="show_battery_percentage" msgid="5444136600512968798">"မြုတ်ထားသည့် ဘတ်ထရီ ရာခိုင်နှုန်းကို ပြပါ"</string> + <string name="show_battery_percentage" msgid="5444136600512968798">"မြုတ်ထားသည့် ဘက်ထရီ ရာခိုင်နှုန်းကို ပြပါ"</string> <string name="show_battery_percentage_summary" msgid="3215025775576786037">"အားမသွင်းနေစဉ်တွင် ဘတ်ထရီအဆင့် ရာခိုင်နှုန်းကို အခြေနေပြဘား အိုင်ကွန်တွင် ပြပါ"</string> <string name="quick_settings" msgid="10042998191725428">"အမြန် ဆက်တင်များ"</string> <string name="status_bar" msgid="4877645476959324760">"အခြေအနေပြနေရာ"</string> @@ -562,10 +566,10 @@ <string name="keyboard_shortcut_group_applications_youtube" msgid="6555453761294723317">"YouTube"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="9043614299194991263">"Calendar"</string> <string name="tuner_full_zen_title" msgid="4540823317772234308">"အသံထိန်းချုပ်သည့်ခလုတ်များဖြင့် ပြပါ"</string> - <string name="volume_and_do_not_disturb" msgid="3373784330208603030">"မနှောက်ယှက်ပါနှင့်"</string> + <string name="volume_and_do_not_disturb" msgid="3373784330208603030">"မနှောင့်ယှက်ရ"</string> <string name="volume_dnd_silent" msgid="4363882330723050727">"အသံထိန်းချုပ်သည့်ခလုတ် ဖြတ်လမ်း"</string> <string name="volume_up_silent" msgid="7141255269783588286">"အသံချဲ့သည်နှင့် မနှောက်ယှက်ရမှ ထွက်ပါ"</string> - <string name="battery" msgid="7498329822413202973">"ဘတ်ထရီ"</string> + <string name="battery" msgid="7498329822413202973">"ဘက်ထရီ"</string> <string name="clock" msgid="7416090374234785905">"နာရီ"</string> <string name="headset" msgid="4534219457597457353">"မိုက်ခွက်ပါနားကြပ်"</string> <string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"နားကြပ်တပ်ဆင်ပြီးပါပြီ"</string> @@ -584,7 +588,7 @@ <string name="select_button" msgid="1597989540662710653">"ပေါင်းထည့်ရန် ခလုတ်ကိုရွေးပါ"</string> <string name="add_button" msgid="4134946063432258161">"ခလုတ်ပေါင်းထည့်ပါ"</string> <string name="save" msgid="2311877285724540644">"သိမ်းဆည်းပါ"</string> - <string name="reset" msgid="2448168080964209908">"ပြန်လည်စတင်စေရန်"</string> + <string name="reset" msgid="2448168080964209908">"ပြန်လည်သတ်မှတ်ရန်"</string> <string name="no_home_title" msgid="1563808595146071549">"ပင်မခလုတ်မတွေ့ပါ"</string> <string name="no_home_message" msgid="5408485011659260911">"ဤစက်ပစ္စည်းကိုရွှေ့လျားနိုင်ရန် ပင်မခလုတ် လိုအပ်ပါသည်။ မသိမ်းဆည်းမီ ပင်မခလုတ်ကို ပေါင်းထည့်ပါ။"</string> <string name="adjust_button_width" msgid="6138616087197632947">"ခလုတ်အလျားကို ချိန်ညှိပါ"</string> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index eb575da3b005..fc81c3cd5c07 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Aktive stedsforespørsler"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Fjern alle varslinger."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> andre varsler i gruppen.</item> + <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> annet varsel i gruppen.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Varselinnstillinger"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g>-innstillinger"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Skjermen roterer automatisk."</string> diff --git a/packages/SystemUI/res/values-ne-rNP/strings.xml b/packages/SystemUI/res/values-ne-rNP/strings.xml index f473d8e8b313..4f321cf8be24 100644 --- a/packages/SystemUI/res/values-ne-rNP/strings.xml +++ b/packages/SystemUI/res/values-ne-rNP/strings.xml @@ -43,7 +43,7 @@ <string name="battery_saver_confirmation_ok" msgid="7507968430447930257">"खोल्नुहोस्"</string> <string name="battery_saver_start_action" msgid="5576697451677486320">"ब्याट्री बचत खोल्नुहोस्"</string> <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"सेटिङहरू"</string> - <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"वाइफाइ"</string> + <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string> <string name="status_bar_settings_auto_rotation" msgid="3790482541357798421">"स्वत:घुम्ने स्क्रिन"</string> <string name="status_bar_settings_mute_label" msgid="554682549917429396">"म्युट गर्नुहोस्"</string> <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"स्वतः"</string> @@ -147,7 +147,7 @@ <string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string> <string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"रोमिङ"</string> <string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string> - <string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"वाइफाइ"</string> + <string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string> <string name="accessibility_no_sim" msgid="8274017118472455155">"SIM छैन।"</string> <string name="accessibility_cell_data" msgid="7080312242791850520">"सेलुलर डेटा"</string> <string name="accessibility_cell_data_on" msgid="4310018593519761767">"सेलुलर डेटा सक्रिय छ"</string> @@ -185,8 +185,8 @@ <string name="accessibility_desc_close" msgid="7479755364962766729">"बन्द गर्नुहोस्"</string> <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"प्रयोगकर्ता <xliff:g id="USER">%s</xliff:g>।"</string> <string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>।"</string> - <string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"वाइफाइ बन्द गरियो।"</string> - <string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"वाइफाइ खुला गरियो।"</string> + <string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi बन्द गरियो।"</string> + <string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi खुला गरियो।"</string> <string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"मोवाइल <xliff:g id="SIGNAL">%1$s</xliff:g>। <xliff:g id="TYPE">%2$s</xliff:g>। <xliff:g id="NETWORK">%3$s</xliff:g>।"</string> <string name="accessibility_quick_settings_battery" msgid="1480931583381408972">"ब्याट्री <xliff:g id="STATE">%s</xliff:g>।"</string> <string name="accessibility_quick_settings_airplane_off" msgid="7786329360056634412">"हवाइजहाज मोड बन्द।"</string> @@ -236,15 +236,19 @@ <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G डेटा रोकिएको छ"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="4651001290947318931">"सेल्यूलर डेटा रोकिएको छ"</string> <string name="data_usage_disabled_dialog_title" msgid="3932437232199671967">"डेटा रोकिएको छ"</string> - <string name="data_usage_disabled_dialog" msgid="8453242888903772524">"तपाईंले सेट गर्नुभएको डेटाको सीमा पुगेकाले, यन्त्रले यस चक्रको बाँकी भागका लागि डेटा प्रयोग रोकेको छ।\n\nपुन: सुरू गर्दा तपाईंको क्यारियरले शुल्कहरू लिन सक्छ।"</string> + <string name="data_usage_disabled_dialog" msgid="8453242888903772524">"तपाईंले सेट गर्नुभएको डेटाको सीमा पुगेकाले, यन्त्रले यस चक्रको बाँकी भागका लागि डेटाको प्रयोग रोकेको छ।\n\nपुन: सुरू गर्दा तपाईंको क्यारियरले शुल्कहरू लिन सक्छ।"</string> <string name="data_usage_disabled_dialog_enable" msgid="1412395410306390593">"पुनः सुरु गर्नुहोस्"</string> <string name="status_bar_settings_signal_meter_disconnected" msgid="1940231521274147771">"इन्टरनेट जडान छैन"</string> - <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="6557486452774597820">"वाइफाइ जडित"</string> + <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="6557486452774597820">"Wi-Fi जडित"</string> <string name="gps_notification_searching_text" msgid="8574247005642736060">"GPSको लागि खोजी गर्दै"</string> <string name="gps_notification_found_text" msgid="4619274244146446464">"GPS द्वारा स्थान सेट गरिएको"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"स्थान अनुरोधहरू सक्रिय"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"सबै सूचनाहरू हटाउनुहोस्।"</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other">भित्र थप <xliff:g id="NUMBER_1">%s</xliff:g> सूचनाहरू छन्।</item> + <item quantity="one">भित्र थप <xliff:g id="NUMBER_0">%s</xliff:g> सूचना छ।</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"अधिसूचना सेटिङ्हरू"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> सेटिङ्हरू"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"स्क्रिन स्वतः घुम्ने छ।"</string> @@ -282,10 +286,10 @@ <string name="quick_settings_user_label" msgid="5238995632130897840">"मलाई"</string> <string name="quick_settings_user_title" msgid="4467690427642392403">"प्रयोगकर्ता"</string> <string name="quick_settings_user_new_user" msgid="9030521362023479778">"नयाँ प्रयोगकर्ता"</string> - <string name="quick_settings_wifi_label" msgid="9135344704899546041">"वाइफाइ"</string> + <string name="quick_settings_wifi_label" msgid="9135344704899546041">"Wi-Fi"</string> <string name="quick_settings_wifi_not_connected" msgid="7171904845345573431">"जोडिएको छैन"</string> <string name="quick_settings_wifi_no_network" msgid="2221993077220856376">"नेटवर्क छैन"</string> - <string name="quick_settings_wifi_off_label" msgid="7558778100843885864">"वाइफाइ बन्द"</string> + <string name="quick_settings_wifi_off_label" msgid="7558778100843885864">"Wi-Fi बन्द"</string> <string name="quick_settings_wifi_on_label" msgid="7607810331387031235">"Wi-Fi सक्रिय छ"</string> <string name="quick_settings_wifi_detail_empty_text" msgid="269990350383909226">"Wi-Fi नेटवर्क अनुपलब्ध"</string> <string name="quick_settings_cast_title" msgid="7709016546426454729">"Cast"</string> @@ -306,7 +310,7 @@ <string name="quick_settings_notifications_label" msgid="4818156442169154523">"अधिसूचनाहरू"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"फ्ल्यासलाइट"</string> <string name="quick_settings_cellular_detail_title" msgid="8575062783675171695">"सेलुलर डेटा"</string> - <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"डेटा प्रयोग"</string> + <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"डेटाको प्रयोग"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"बाँकी डेटा"</string> <string name="quick_settings_cellular_detail_over_limit" msgid="967669665390990427">"सीमाभन्दा बढी"</string> <string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> प्रयोग गरियो"</string> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index 727285eb631c..78132bde2bda 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Locatieverzoeken actief"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Alle meldingen wissen."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other">Nog <xliff:g id="NUMBER_1">%s</xliff:g> meldingen in groep.</item> + <item quantity="one">Nog <xliff:g id="NUMBER_0">%s</xliff:g> melding in groep.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Instellingen voor meldingen"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g>-instellingen"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Scherm wordt automatisch geroteerd."</string> diff --git a/packages/SystemUI/res/values-pa-rIN/strings.xml b/packages/SystemUI/res/values-pa-rIN/strings.xml index e124fa2cdb64..c8083a25cb44 100644 --- a/packages/SystemUI/res/values-pa-rIN/strings.xml +++ b/packages/SystemUI/res/values-pa-rIN/strings.xml @@ -165,7 +165,7 @@ <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS ਸਮਰਥਿਤ।"</string> <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS ਪ੍ਰਾਪਤ ਕਰ ਰਿਹਾ ਹੈ।"</string> <string name="accessibility_tty_enabled" msgid="4613200365379426561">"ਟੈਲੀ ਟਾਈਪਰਾਈਟਰ ਸਮਰਥਿਤ।"</string> - <string name="accessibility_ringer_vibrate" msgid="666585363364155055">"ਰਿੰਗਰ ਵਾਈਬ੍ਰੇਟ।"</string> + <string name="accessibility_ringer_vibrate" msgid="666585363364155055">"ਰਿੰਗਰ ਥਰਥਰਾਹਟ।"</string> <string name="accessibility_ringer_silent" msgid="9061243307939135383">"ਰਿੰਗਰ ਸਾਈਲੈਂਟ।"</string> <!-- no translation found for accessibility_casting (6887382141726543668) --> <skip /> @@ -236,7 +236,7 @@ <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G ਡੈਟਾ ਰੁਕ ਗਿਆ ਹੈ"</string> <string name="data_usage_disabled_dialog_mobile_title" msgid="4651001290947318931">"ਸੈਲਿਊਲਰ ਡੈਟਾ ਰੁਕ ਗਿਆ ਹੈ"</string> <string name="data_usage_disabled_dialog_title" msgid="3932437232199671967">"ਡੈਟਾ ਰੁਕ ਗਿਆ ਹੈ"</string> - <string name="data_usage_disabled_dialog" msgid="8453242888903772524">"ਕਿਉਂਕਿ ਤੁਹਾਡੀ ਸੈਟ ਡੈਟਾ ਸੀਮਾ ਪੂਰੀ ਹੋ ਗਈ ਸੀ, ਡੀਵਾਈਸ ਨੇ ਇਸ ਬਾਕੀ ਚੱਕਰ ਲਈ ਡੈਟਾ ਵਰਤੋਂ ਰੋਕ ਦਿੱਤੀ ਹੈ।\n\nਇਸਨੂੰ ਦੁਬਾਰਾ ਸ਼ੁਰੂ ਕਰਨ ਨਾਲ ਤੁਹਾਡੇ ਕੈਰੀਅਰ ਵੱਲੋਂ ਖ਼ਰਚੇ ਪਾਏ ਜਾ ਸਕਦੇ ਹਨ।"</string> + <string name="data_usage_disabled_dialog" msgid="8453242888903772524">"ਕਿਉਂਕਿ ਤੁਹਾਡੀ ਸੈਟ ਡੈਟਾ ਸੀਮਾ ਪੂਰੀ ਹੋ ਗਈ ਸੀ, ਡੀਵਾਈਸ ਨੇ ਇਸ ਬਾਕੀ ਚੱਕਰ ਲਈ ਡੈਟਾ ਉਪਯੋਗ ਰੋਕ ਦਿੱਤਾ ਹੈ।\n\nਇਸਨੂੰ ਦੁਬਾਰਾ ਸ਼ੁਰੂ ਕਰਨ ਨਾਲ ਤੁਹਾਡੇ ਕੈਰੀਅਰ ਵੱਲੋਂ ਖ਼ਰਚੇ ਪਾਏ ਜਾ ਸਕਦੇ ਹਨ।"</string> <string name="data_usage_disabled_dialog_enable" msgid="1412395410306390593">"ਦੁਬਾਰਾ ਸ਼ੁਰੂ ਕਰੋ"</string> <string name="status_bar_settings_signal_meter_disconnected" msgid="1940231521274147771">"ਕੋਈ ਇੰਟਰਨੈਟ ਕਨੈਕਸ਼ਨ ਨਹੀਂ"</string> <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="6557486452774597820">"Wi-Fi ਕਨੈਕਟ ਕੀਤਾ"</string> @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਸੇਵਾ ਬੇਨਤੀਆਂ ਸਕਿਰਿਆ"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"ਸਾਰੀਆਂ ਸੂਚਨਾਵਾਂ ਹਟਾਓ।"</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="one">ਅੰਦਰ <xliff:g id="NUMBER_1">%s</xliff:g> ਹੋਰ ਸੂਚਨਾਵਾਂ।</item> + <item quantity="other">ਅੰਦਰ <xliff:g id="NUMBER_1">%s</xliff:g> ਹੋਰ ਸੂਚਨਾਵਾਂ।</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"ਸੂਚਨਾ ਸੈਟਿੰਗਾਂ"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> ਸੈਟਿੰਗਾਂ"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"ਸਕ੍ਰੀਨ ਆਟੋਮੈਟਿਕਲੀ ਰੋਟੇਟ ਕਰੇਗੀ।"</string> @@ -306,7 +310,7 @@ <string name="quick_settings_notifications_label" msgid="4818156442169154523">"ਸੂਚਨਾਵਾਂ"</string> <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"ਫਲੈਸ਼ਲਾਈਟ"</string> <string name="quick_settings_cellular_detail_title" msgid="8575062783675171695">"ਸੈਲਿਊਲਰ ਡੈਟਾ"</string> - <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"ਡੈਟਾ ਵਰਤੋਂ"</string> + <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"ਡੈਟਾ ਉਪਯੋਗ"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"ਬਾਕੀ ਡੈਟਾ"</string> <string name="quick_settings_cellular_detail_over_limit" msgid="967669665390990427">"ਸੀਮਾ ਤੋਂ ਵੱਧ"</string> <string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> ਵਰਤਿਆ"</string> @@ -326,7 +330,7 @@ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"ਹੌਰੀਜ਼ੌਂਟਲ ਸਪਲਿਟ"</string> <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"ਵਰਟੀਕਲ ਸਪਲਿਟ"</string> <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"ਕਸਟਮ ਸਪਲਿਟ"</string> - <string name="expanded_header_battery_charged" msgid="5945855970267657951">"ਚਾਰਜ ਕੀਤਾ"</string> + <string name="expanded_header_battery_charged" msgid="5945855970267657951">"ਚਾਰਜ ਹੋਇਆ"</string> <string name="expanded_header_battery_charging" msgid="205623198487189724">"ਚਾਰਜ ਕਰ ਰਿਹਾ ਹੈ"</string> <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> ਪੂਰਾ ਹੋਣ ਤੱਕ"</string> <string name="expanded_header_battery_not_charging" msgid="4798147152367049732">"ਚਾਰਜ ਨਹੀਂ ਹੋ ਰਿਹਾ"</string> @@ -434,8 +438,8 @@ <string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s। ਅਣਮਿਊਟ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।"</string> <string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s। ਥਰਥਰਾਹਟ ਸੈੱਟ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ। ਪਹੁੰਚਯੋਗਤਾ ਸੇਵਾਵਾਂ ਮਿਊਟ ਹੋ ਸਕਦੀਆਂ ਹਨ।"</string> <string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s। ਮਿਊਟ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ। ਪਹੁੰਚਯੋਗਤਾ ਸੇਵਾਵਾਂ ਮਿਊਟ ਹੋ ਸਕਦੀਆਂ ਹਨ।"</string> - <string name="volume_dialog_accessibility_shown_message" msgid="1834631467074259998">"%s ਵੌਲਯੂਮ ਕੰਟਰੋਲ ਵਿਖਾਏ ਗਏ ਹਨ। ਬਰਖ਼ਾਸਤ ਕਰਨ ਲਈ ਉੱਪਰ ਸਵਾਈਪ ਕਰੋ।"</string> - <string name="volume_dialog_accessibility_dismissed_message" msgid="51543526013711399">"ਵੌਲਯੂਮ ਕੰਟਰੋਲ ਲੁਕਾਏ ਗਏ ਹਨ"</string> + <string name="volume_dialog_accessibility_shown_message" msgid="1834631467074259998">"%s ਵੌਲਿਊਮ ਕੰਟਰੋਲ ਵਿਖਾਏ ਗਏ ਹਨ। ਬਰਖ਼ਾਸਤ ਕਰਨ ਲਈ ਉੱਪਰ ਸਵਾਈਪ ਕਰੋ।"</string> + <string name="volume_dialog_accessibility_dismissed_message" msgid="51543526013711399">"ਵੌਲਿਊਮ ਕੰਟਰੋਲ ਲੁਕਾਏ ਗਏ ਹਨ"</string> <string name="system_ui_tuner" msgid="708224127392452018">"System UI ਟਿਊਨਰ"</string> <string name="show_battery_percentage" msgid="5444136600512968798">"ਜੋਡ਼ੀ ਗਈ ਬੈਟਰੀ ਪ੍ਰਤਿਸ਼ਤਤਾ ਦਿਖਾਓ"</string> <string name="show_battery_percentage_summary" msgid="3215025775576786037">"ਜਦੋਂ ਚਾਰਜ ਨਾ ਹੋ ਰਹੀ ਹੋਵੇ ਤਾਂ ਸਥਿਤੀ ਬਾਰ ਦੇ ਅੰਦਰ ਬੈਟਰੀ ਪੱਧਰ ਪ੍ਰਤਿਸ਼ਤਤਾ ਦਿਖਾਓ"</string> @@ -562,10 +566,10 @@ <string name="keyboard_shortcut_group_applications_music" msgid="4775559515850922780">"ਸੰਗੀਤ"</string> <string name="keyboard_shortcut_group_applications_youtube" msgid="6555453761294723317">"YouTube"</string> <string name="keyboard_shortcut_group_applications_calendar" msgid="9043614299194991263">"ਕੈਲੰਡਰ"</string> - <string name="tuner_full_zen_title" msgid="4540823317772234308">"ਵੌਲਯੂਮ ਕੰਟਰੋਲਾਂ ਨਾਲ ਵਿਖਾਓ"</string> + <string name="tuner_full_zen_title" msgid="4540823317772234308">"ਵੌਲਿਊਮ ਕੰਟਰੋਲਾਂ ਨਾਲ ਵਿਖਾਓ"</string> <string name="volume_and_do_not_disturb" msgid="3373784330208603030">"ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ"</string> - <string name="volume_dnd_silent" msgid="4363882330723050727">"ਵੌਲਯੂਮ ਬਟਨ ਸ਼ਾਰਟਕੱਟ"</string> - <string name="volume_up_silent" msgid="7141255269783588286">"ਵੌਲਯੂਮ ਉੱਚੀ ਹੋਣ \'ਤੇ ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਤੋਂ ਬਾਹਰ ਜਾਓ"</string> + <string name="volume_dnd_silent" msgid="4363882330723050727">"ਵੌਲਿਊਮ ਬਟਨ ਸ਼ਾਰਟਕੱਟ"</string> + <string name="volume_up_silent" msgid="7141255269783588286">"ਵੌਲਿਊਮ ਉੱਚੀ ਹੋਣ \'ਤੇ ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਤੋਂ ਬਾਹਰ ਜਾਓ"</string> <string name="battery" msgid="7498329822413202973">"ਬੈਟਰੀ"</string> <string name="clock" msgid="7416090374234785905">"ਘੜੀ"</string> <string name="headset" msgid="4534219457597457353">"ਹੈੱਡਸੈੱਟ"</string> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index dd7e4e6cdab5..3cf8294e58a0 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -247,6 +247,12 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Prośby o lokalizację są aktywne"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Usuń wszystkie powiadomienia."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="few">Jeszcze <xliff:g id="NUMBER_1">%s</xliff:g> powiadomienia w grupie.</item> + <item quantity="many">Jeszcze <xliff:g id="NUMBER_1">%s</xliff:g> powiadomień w grupie.</item> + <item quantity="other">Jeszcze <xliff:g id="NUMBER_1">%s</xliff:g> powiadomienia w grupie.</item> + <item quantity="one">Jeszcze <xliff:g id="NUMBER_0">%s</xliff:g> powiadomienie w grupie.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Ustawienia powiadomień"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Ustawienia aplikacji <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Ekran zostanie obrócony automatycznie."</string> diff --git a/packages/SystemUI/res/values-pt-rBR/strings.xml b/packages/SystemUI/res/values-pt-rBR/strings.xml index a315ceca63e2..6feea2089fab 100644 --- a/packages/SystemUI/res/values-pt-rBR/strings.xml +++ b/packages/SystemUI/res/values-pt-rBR/strings.xml @@ -247,6 +247,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Solicitações de localização ativas"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Limpar todas as notificações."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"Mais <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="one">Mais <xliff:g id="NUMBER_1">%s</xliff:g> notificações no grupo.</item> + <item quantity="other">Mais <xliff:g id="NUMBER_1">%s</xliff:g> notificações no grupo.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Configurações de notificação"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Configurações de <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"A tela girará automaticamente."</string> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index 07604b12731f..c3934009b922 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Pedidos de localização ativos"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Limpar todas as notificações."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other">Mais <xliff:g id="NUMBER_1">%s</xliff:g> notificações no grupo.</item> + <item quantity="one">Mais <xliff:g id="NUMBER_0">%s</xliff:g> notificação no grupo.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Definições de notificação"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Definições do <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"O ecrã será rodado automaticamente."</string> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index a315ceca63e2..6feea2089fab 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -247,6 +247,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Solicitações de localização ativas"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Limpar todas as notificações."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"Mais <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="one">Mais <xliff:g id="NUMBER_1">%s</xliff:g> notificações no grupo.</item> + <item quantity="other">Mais <xliff:g id="NUMBER_1">%s</xliff:g> notificações no grupo.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Configurações de notificação"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Configurações de <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"A tela girará automaticamente."</string> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index 9b52ffd7d6f2..5f3eed7243f1 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -248,6 +248,11 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Solicitări locație active"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Ștergeți toate notificările."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="few">Încă <xliff:g id="NUMBER_1">%s</xliff:g> notificări în grup.</item> + <item quantity="other">Încă <xliff:g id="NUMBER_1">%s</xliff:g> de notificări în grup.</item> + <item quantity="one">Încă <xliff:g id="NUMBER_0">%s</xliff:g> notificare în grup.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Setări pentru notificări"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Setări <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Ecranul se va roti în mod automat."</string> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index 978684ee4337..062ea4870bb3 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -249,6 +249,12 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Есть активные запросы на определение местоположения"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Удалить все уведомления"</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="one">Ещё <xliff:g id="NUMBER_1">%s</xliff:g> уведомление.</item> + <item quantity="few">Ещё <xliff:g id="NUMBER_1">%s</xliff:g> уведомления.</item> + <item quantity="many">Ещё <xliff:g id="NUMBER_1">%s</xliff:g> уведомлений.</item> + <item quantity="other">Ещё <xliff:g id="NUMBER_1">%s</xliff:g> уведомления.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Настройки уведомлений"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Настройки приложения \"<xliff:g id="APP_NAME">%s</xliff:g>\""</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Экран будет поворачиваться автоматически."</string> @@ -382,7 +388,7 @@ <string name="user_logout_notification_text" msgid="3350262809611876284">"Выход от имени пользователя"</string> <string name="user_logout_notification_action" msgid="1195428991423425062">"ВЫЙТИ ОТ ИМЕНИ ПОЛЬЗОВАТЕЛЯ"</string> <string name="user_add_user_title" msgid="4553596395824132638">"Добавить пользователя?"</string> - <string name="user_add_user_message_short" msgid="2161624834066214559">"После создания профиля его необходимо настроить.\n\nОбновлять приложения для всех аккаунтов может любой пользователь устройства."</string> + <string name="user_add_user_message_short" msgid="2161624834066214559">"После создания профиля его потребуется настроить.\n\nЛюбой пользователь устройства может обновлять приложения для всех аккаунтов."</string> <string name="user_remove_user_title" msgid="4681256956076895559">"Удалить аккаунт?"</string> <string name="user_remove_user_message" msgid="1453218013959498039">"Все приложения и данные этого пользователя будут удалены."</string> <string name="user_remove_user_remove" msgid="7479275741742178297">"Удалить"</string> diff --git a/packages/SystemUI/res/values-si-rLK/strings.xml b/packages/SystemUI/res/values-si-rLK/strings.xml index c845a38468e2..90f75a6d090f 100644 --- a/packages/SystemUI/res/values-si-rLK/strings.xml +++ b/packages/SystemUI/res/values-si-rLK/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"පිහිටීම් ඉල්ලීම් සක්රියයි"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"සියලු දැනුම්දීම් හිස් කරන්න."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="one">ඇතුළත තව දැනුම්දීම් <xliff:g id="NUMBER_1">%s</xliff:g>ක් ඇත.</item> + <item quantity="other">ඇතුළත තව දැනුම්දීම් <xliff:g id="NUMBER_1">%s</xliff:g>ක් ඇත.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"දැනුම්දීම් සැකසීම්"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> සැකසීම්"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"තිරය ස්වයංක්රීයව කරකැවේ."</string> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index 65e2a92fd136..f0537c3e5325 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -249,6 +249,12 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Žiadosti o polohu sú aktívne"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Vymazať všetky upozornenia."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="few">Skupina obsahuje ešte <xliff:g id="NUMBER_1">%s</xliff:g> upozornenia.</item> + <item quantity="many">Skupina obsahuje ešte <xliff:g id="NUMBER_1">%s</xliff:g> upozornenia.</item> + <item quantity="other">Skupina obsahuje ešte <xliff:g id="NUMBER_1">%s</xliff:g> upozornení.</item> + <item quantity="one">Skupina obsahuje ešte <xliff:g id="NUMBER_0">%s</xliff:g> upozornenie.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Nastavenia upozornení"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Nastavenia aplikácie <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Obrazovka sa automaticky otočí."</string> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index 66334d42b30e..4eafc0b13efb 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -249,6 +249,12 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Aktivne zahteve za lokacijo"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Izbriši vsa obvestila."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"in <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="one">Notri je še <xliff:g id="NUMBER_1">%s</xliff:g> obvestilo.</item> + <item quantity="two">Notri sta še <xliff:g id="NUMBER_1">%s</xliff:g> obvestili.</item> + <item quantity="few">Notri so še <xliff:g id="NUMBER_1">%s</xliff:g> obvestila.</item> + <item quantity="other">Notri je še <xliff:g id="NUMBER_1">%s</xliff:g> obvestil.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Nastavitve obvestil"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Nastavitve aplikacije <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Zaslon se bo samodejno zasukal."</string> diff --git a/packages/SystemUI/res/values-sq-rAL/strings.xml b/packages/SystemUI/res/values-sq-rAL/strings.xml index 14f840e03f70..688e6437f564 100644 --- a/packages/SystemUI/res/values-sq-rAL/strings.xml +++ b/packages/SystemUI/res/values-sq-rAL/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Kërkesat për vendodhje janë aktive"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Pastro të gjitha njoftimet."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> njoftime të tjera në brendësi.</item> + <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> njoftim tjetër në brendësi.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Cilësimet e njoftimeve"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Cilësimet e <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Ekrani do të rrotullohet automatikisht."</string> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index 437a4d8a9725..2bfdc887dc98 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -246,6 +246,11 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Има активних захтева за локацију"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Обриши сва обавештења."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"и још <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="one">Још <xliff:g id="NUMBER_1">%s</xliff:g> обавештење у групи.</item> + <item quantity="few">Још <xliff:g id="NUMBER_1">%s</xliff:g> обавештења у групи.</item> + <item quantity="other">Још <xliff:g id="NUMBER_1">%s</xliff:g> обавештења у групи.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Подешавања обавештења"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Подешавања за <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Екран ће се аутоматски ротирати."</string> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index e20986acb4b8..7c2f3af066ae 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Det finns aktiva platsbegäranden"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Ta bort alla meddelanden."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"<xliff:g id="NUMBER">%s</xliff:g> till"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> fler aviseringar i gruppen.</item> + <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> till avisering i gruppen.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Aviseringsinställningar"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Inställningar för <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Skärmen roteras automatiskt."</string> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index 3fe37b95f1f7..28b6153cde1a 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Maombi ya eneo yanatumika"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Futa arifa zote."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other">Kuna arifa <xliff:g id="NUMBER_1">%s</xliff:g> zaidi katika kikundi.</item> + <item quantity="one">Kuna arifa <xliff:g id="NUMBER_0">%s</xliff:g> zaidi katika kikundi.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Mipangilio ya arifa"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Mipangilio ya <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Skrini itazunguka kiotomatiki."</string> @@ -365,7 +369,7 @@ <string name="guest_new_guest" msgid="600537543078847803">"Ongeza aliyealikwa"</string> <string name="guest_exit_guest" msgid="7187359342030096885">"Ondoa aliyealikwa"</string> <string name="guest_exit_guest_dialog_title" msgid="8480693520521766688">"Ungependa kumwondoa aliyealikwa?"</string> - <string name="guest_exit_guest_dialog_message" msgid="4155503224769676625">"Programu zote na data katika kipindi hiki zitafutwa."</string> + <string name="guest_exit_guest_dialog_message" msgid="4155503224769676625">"Data na programu zote katika kipindi hiki zitafutwa."</string> <string name="guest_exit_guest_dialog_remove" msgid="7402231963862520531">"Ondoa"</string> <string name="guest_wipe_session_title" msgid="6419439912885956132">"Karibu tena, mwalikwa!"</string> <string name="guest_wipe_session_message" msgid="8476238178270112811">"Je, unataka kuendelea na kipindi chako?"</string> diff --git a/packages/SystemUI/res/values-ta-rIN/strings.xml b/packages/SystemUI/res/values-ta-rIN/strings.xml index d385ce007dc8..180ed4f3aefe 100644 --- a/packages/SystemUI/res/values-ta-rIN/strings.xml +++ b/packages/SystemUI/res/values-ta-rIN/strings.xml @@ -215,11 +215,11 @@ <string name="accessibility_quick_settings_close" msgid="3115847794692516306">"பேனலை மூடு."</string> <string name="accessibility_quick_settings_more_time" msgid="3659274935356197708">"நேரத்தை அதிகரி."</string> <string name="accessibility_quick_settings_less_time" msgid="2404728746293515623">"நேரத்தைக் குறை."</string> - <string name="accessibility_quick_settings_flashlight_off" msgid="4936432000069786988">"ஃபிளாஷ்லைட் முடக்கத்தில்."</string> - <string name="accessibility_quick_settings_flashlight_unavailable" msgid="8012811023312280810">"ஃபிளாஷ்லைட் இல்லை."</string> - <string name="accessibility_quick_settings_flashlight_on" msgid="2003479320007841077">"ஃபிளாஷ்லைட் இயக்கத்தில்."</string> + <string name="accessibility_quick_settings_flashlight_off" msgid="4936432000069786988">"டார்ச் லைட் எரியவில்லை."</string> + <string name="accessibility_quick_settings_flashlight_unavailable" msgid="8012811023312280810">"டார்ச் லைட் இல்லை."</string> + <string name="accessibility_quick_settings_flashlight_on" msgid="2003479320007841077">"டார்ச் லைட் எரிகிறது"</string> <string name="accessibility_quick_settings_flashlight_changed_off" msgid="3303701786768224304">"ஃபிளாஷ்லைட் முடக்கப்பட்டது."</string> - <string name="accessibility_quick_settings_flashlight_changed_on" msgid="6531793301533894686">"ஃபிளாஷ்லைட் இயக்கப்பட்டது."</string> + <string name="accessibility_quick_settings_flashlight_changed_on" msgid="6531793301533894686">"டார்ச் லைட் எரிகிறது"</string> <string name="accessibility_quick_settings_color_inversion_changed_off" msgid="4406577213290173911">"வண்ண நேர்மாறு முறை முடக்கப்பட்டது."</string> <string name="accessibility_quick_settings_color_inversion_changed_on" msgid="6897462320184911126">"வண்ண நேர்மாறு முறை இயக்கப்பட்டது."</string> <string name="accessibility_quick_settings_hotspot_changed_off" msgid="5004708003447561394">"மொபைல் ஹாட்ஸ்பாட் முடக்கப்பட்டது."</string> @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"இருப்பிடக் கோரிக்கைகள் இயக்கப்பட்டன"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"எல்லா அறிவிப்புகளையும் அழி."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other">உள்ளே மேலும் <xliff:g id="NUMBER_1">%s</xliff:g> அறிவிப்புகள் உள்ளன.</item> + <item quantity="one">உள்ளே மேலும் <xliff:g id="NUMBER_0">%s</xliff:g> அறிவிப்பு உள்ளது.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"அறிவிப்பு அமைப்புகள்"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> அமைப்புகள்"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"திரை தானாகச் சுழலும்."</string> @@ -304,7 +308,7 @@ <string name="quick_settings_tethering_label" msgid="7153452060448575549">"டெதெரிங்"</string> <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"ஹாட்ஸ்பாட்"</string> <string name="quick_settings_notifications_label" msgid="4818156442169154523">"அறிவிப்புகள்"</string> - <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"ஃபிளாஷ்லைட்"</string> + <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"டார்ச் லைட்"</string> <string name="quick_settings_cellular_detail_title" msgid="8575062783675171695">"செல்லுலார் தரவு"</string> <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"தரவுப் பயன்பாடு"</string> <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"மீதமுள்ள தரவு"</string> diff --git a/packages/SystemUI/res/values-te-rIN/strings.xml b/packages/SystemUI/res/values-te-rIN/strings.xml index 5e195642f40e..1843ee4d3bc7 100644 --- a/packages/SystemUI/res/values-te-rIN/strings.xml +++ b/packages/SystemUI/res/values-te-rIN/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"స్థాన అభ్యర్థనలు సక్రియంగా ఉన్నాయి"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"అన్ని నోటిఫికేషన్లను క్లియర్ చేయండి."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other">లోపల మరో <xliff:g id="NUMBER_1">%s</xliff:g> నోటిఫికేషన్లు ఉన్నాయి.</item> + <item quantity="one">లోపల మరో <xliff:g id="NUMBER_0">%s</xliff:g> నోటిఫికేషన్ ఉంది.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"నోటిఫికేషన్ సెట్టింగ్లు"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> సెట్టింగ్లు"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"స్క్రీన్ స్వయంచాలకంగా తిప్పబడుతుంది."</string> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index c4b51525bb5d..a20033af6de3 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"คำขอตำแหน่งที่มีการใช้งาน"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"ล้างการแจ้งเตือนทั้งหมด"</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other">มีการแจ้งเตือนอีก <xliff:g id="NUMBER_1">%s</xliff:g> รายการด้านใน</item> + <item quantity="one">มีการแจ้งเตือนอีก <xliff:g id="NUMBER_0">%s</xliff:g> รายการด้านใน</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"การตั้งค่าการแจ้งเตือน"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"การตั้งค่า <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"หน้าจอจะหมุนโดยอัตโนมัติ"</string> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index d618073058b1..41326ab74a39 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Aktibo ang mga kahilingan ng lokasyon"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"I-clear ang lahat ng notification."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="one">May <xliff:g id="NUMBER_1">%s</xliff:g> pang notification sa loob.</item> + <item quantity="other">May <xliff:g id="NUMBER_1">%s</xliff:g> pang notification sa loob.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Mga setting ng notification"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Mg setting ng <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Awtomatikong iikot ang screen."</string> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index 2763468ee89e..e95785fd9d8b 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Konum bilgisi istekleri etkin"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Tüm bildirimleri temizle"</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other">Grup içinde <xliff:g id="NUMBER_1">%s</xliff:g> bildirim daha var.</item> + <item quantity="one">Grup içinde <xliff:g id="NUMBER_0">%s</xliff:g> bildirim daha var.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Bildirim ayarları"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> ayarları"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Ekran otomatik olarak dönecektir."</string> @@ -288,7 +292,7 @@ <string name="quick_settings_wifi_off_label" msgid="7558778100843885864">"Kablosuz Kapalı"</string> <string name="quick_settings_wifi_on_label" msgid="7607810331387031235">"Kablosuz Bağlantı Açık"</string> <string name="quick_settings_wifi_detail_empty_text" msgid="269990350383909226">"Kullanılabilir kablosuz ağ yok"</string> - <string name="quick_settings_cast_title" msgid="7709016546426454729">"Yayınlama"</string> + <string name="quick_settings_cast_title" msgid="7709016546426454729">"Yayınla"</string> <string name="quick_settings_casting" msgid="6601710681033353316">"Yayınlanıyor"</string> <string name="quick_settings_cast_device_default_name" msgid="5367253104742382945">"Adsız cihaz"</string> <string name="quick_settings_cast_device_default_description" msgid="2484573682378634413">"Yayın için hazır"</string> @@ -387,7 +391,7 @@ <string name="battery_saver_notification_action_text" msgid="109158658238110382">"Pil tasarrufunu kapat"</string> <string name="media_projection_dialog_text" msgid="3071431025448218928">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g>, ekranınızda görüntülenen her şeyi kaydetmeye başlayacak."</string> <string name="media_projection_remember_text" msgid="3103510882172746752">"Bir daha gösterme"</string> - <string name="clear_all_notifications_text" msgid="814192889771462828">"Tümü temizle"</string> + <string name="clear_all_notifications_text" msgid="814192889771462828">"Tümünü temizle"</string> <string name="media_projection_action_text" msgid="8470872969457985954">"Şimdi başlat"</string> <string name="empty_shade_text" msgid="708135716272867002">"Bildirim yok"</string> <string name="device_owned_footer" msgid="3802752663326030053">"Cihaz izlenebilir"</string> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index 9d7cb9106695..f68521cb0158 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -249,6 +249,12 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Запити про місцезнаходження активні"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Очистити всі сповіщення."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="one">Ще <xliff:g id="NUMBER_1">%s</xliff:g> сповіщення в групі.</item> + <item quantity="few">Ще <xliff:g id="NUMBER_1">%s</xliff:g> сповіщення в групі.</item> + <item quantity="many">Ще <xliff:g id="NUMBER_1">%s</xliff:g> сповіщень у групі.</item> + <item quantity="other">Ще <xliff:g id="NUMBER_1">%s</xliff:g> сповіщення в групі.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Налаштування сповіщень"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Налаштування додатка <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Екран обертатиметься автоматично."</string> diff --git a/packages/SystemUI/res/values-ur-rPK/strings.xml b/packages/SystemUI/res/values-ur-rPK/strings.xml index 682ca3c3ae5f..92139f169440 100644 --- a/packages/SystemUI/res/values-ur-rPK/strings.xml +++ b/packages/SystemUI/res/values-ur-rPK/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"مقام کی درخواستیں فعال ہیں"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"سبھی اطلاعات صاف کریں۔"</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"<xliff:g id="NUMBER">%s</xliff:g> +"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other">اندر <xliff:g id="NUMBER_1">%s</xliff:g> مزید اطلاعات ہیں۔ </item> + <item quantity="one">اندر <xliff:g id="NUMBER_0">%s</xliff:g> مزید اطلاع ہے۔</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"اطلاع کی ترتیبات"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> ترتیبات"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"اسکرین خود بخود گردش کرے گی۔"</string> diff --git a/packages/SystemUI/res/values-uz-rUZ/strings.xml b/packages/SystemUI/res/values-uz-rUZ/strings.xml index d5156e4c6ce4..c30375bb6705 100644 --- a/packages/SystemUI/res/values-uz-rUZ/strings.xml +++ b/packages/SystemUI/res/values-uz-rUZ/strings.xml @@ -30,7 +30,7 @@ <item quantity="one">Umumiy ma’lumot bo‘limida 1 ta ekran bor</item> </plurals> <string name="status_bar_no_notifications_title" msgid="4755261167193833213">"Bildirishnomalar yo‘q"</string> - <string name="status_bar_ongoing_events_title" msgid="1682504513316879202">"Joriy"</string> + <string name="status_bar_ongoing_events_title" msgid="1682504513316879202">"Hali bajarilmagan"</string> <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Eslatmalar"</string> <string name="battery_low_title" msgid="6456385927409742437">"Batareya quvvati kam qoldi"</string> <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> qoldi"</string> @@ -51,7 +51,7 @@ <string name="bluetooth_tethered" msgid="7094101612161133267">"Bluetooth bog‘landi"</string> <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Kiritish usullarini moslash"</string> <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Tashqi tugmatag"</string> - <string name="usb_device_permission_prompt" msgid="834698001271562057">"<xliff:g id="APPLICATION">%1$s</xliff:g> ilovaga USB qurilmaga kirishga ruxsat berilsinmi?"</string> + <string name="usb_device_permission_prompt" msgid="834698001271562057">"<xliff:g id="APPLICATION">%1$s</xliff:g> ilovasiga USB qurilmaga kirish uchun ruxsat berilsinmi?"</string> <string name="usb_accessory_permission_prompt" msgid="5171775411178865750">"<xliff:g id="APPLICATION">%1$s</xliff:g> ilovasiga USB qurilmaga kirish uchun ruxsat berilsinmi?"</string> <string name="usb_device_confirm_prompt" msgid="5161205258635253206">"USB qurilma ulanganda <xliff:g id="ACTIVITY">%1$s</xliff:g> ochilsinmi?"</string> <string name="usb_accessory_confirm_prompt" msgid="3808984931830229888">"USB jihoz ulanganda <xliff:g id="ACTIVITY">%1$s</xliff:g> ochilsinmi?"</string> @@ -247,6 +247,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Joylashuv so‘rovlari yoniq"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Barcha eslatmalarni tozalash."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other">Guruhda yana <xliff:g id="NUMBER_1">%s</xliff:g> ta bildirishnoma.</item> + <item quantity="one">Guruhda yana <xliff:g id="NUMBER_0">%s</xliff:g> ta bildirishnoma.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Bildirishnoma sozlamalari"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> sozlamalari"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Ekran avtomatik buriladi."</string> @@ -267,7 +271,7 @@ <string name="quick_settings_bluetooth_off_label" msgid="8159652146149219937">"Bluetooth o‘chirilgan"</string> <string name="quick_settings_bluetooth_detail_empty_text" msgid="4910015762433302860">"Ulangan qurilmalar topilmadi"</string> <string name="quick_settings_brightness_label" msgid="6968372297018755815">"Yorqinlik"</string> - <string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Avtomatik burish"</string> + <string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Avtomatik burilish"</string> <string name="accessibility_quick_settings_rotation" msgid="4231661040698488779">"Ekranni avtomatik burish"</string> <string name="accessibility_quick_settings_rotation_value" msgid="1428962304214992318">"Tanlandi: <xliff:g id="ID_1">%s</xliff:g>"</string> <string name="quick_settings_rotation_locked_label" msgid="6359205706154282377">"Aylanmaydigan qilingan"</string> @@ -278,7 +282,7 @@ <string name="quick_settings_location_off_label" msgid="7464544086507331459">"Joylashuv xizmati o‘chiq"</string> <string name="quick_settings_media_device_label" msgid="1302906836372603762">"Media qurilma"</string> <string name="quick_settings_rssi_label" msgid="7725671335550695589">"RSSI"</string> - <string name="quick_settings_rssi_emergency_only" msgid="2713774041672886750">"Favqulodda qo‘ng‘iroqlar"</string> + <string name="quick_settings_rssi_emergency_only" msgid="2713774041672886750">"Favqulodda chaqiruvlar"</string> <string name="quick_settings_settings_label" msgid="5326556592578065401">"Sozlamalar"</string> <string name="quick_settings_time_label" msgid="4635969182239736408">"Vaqt"</string> <string name="quick_settings_user_label" msgid="5238995632130897840">"Men"</string> @@ -535,7 +539,7 @@ <string name="keyboard_key_backspace" msgid="1559580097512385854">"Backspace"</string> <string name="keyboard_key_media_play_pause" msgid="3861975717393887428">"Ijro/Pauza"</string> <string name="keyboard_key_media_stop" msgid="2859963958595908962">"To‘xtatish"</string> - <string name="keyboard_key_media_next" msgid="1894394911630345607">"Keyingi"</string> + <string name="keyboard_key_media_next" msgid="1894394911630345607">"Keyingisi"</string> <string name="keyboard_key_media_previous" msgid="4256072387192967261">"Avvalgi"</string> <string name="keyboard_key_media_rewind" msgid="2654808213360820186">"Orqaga qaytarish"</string> <string name="keyboard_key_media_fast_forward" msgid="3849417047738200605">"Oldinga o‘tkazish"</string> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index 9ded699100ba..24c29072eb4e 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Yêu cầu về thông tin vị trí đang hoạt động"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Xóa tất cả thông báo."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other">Còn <xliff:g id="NUMBER_1">%s</xliff:g> thông báo nữa bên trong.</item> + <item quantity="one">Còn <xliff:g id="NUMBER_0">%s</xliff:g> thông báo nữa bên trong.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Cài đặt thông báo"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Cài đặt <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Màn hình sẽ xoay tự động."</string> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index a11dc0eabd3d..76130990fdc1 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"应用发出了有效位置信息请求"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"清除所有通知。"</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other">此群组内还有 <xliff:g id="NUMBER_1">%s</xliff:g> 条通知。</item> + <item quantity="one">此群组内还有 <xliff:g id="NUMBER_0">%s</xliff:g> 条通知。</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"通知设置"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g>设置"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"屏幕会自动旋转。"</string> diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml index dd7db867a2ba..40d342961450 100644 --- a/packages/SystemUI/res/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res/values-zh-rHK/strings.xml @@ -247,6 +247,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"位置要求啟動中"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"清除所有通知。"</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other">裡面還有 <xliff:g id="NUMBER_1">%s</xliff:g> 個通知。</item> + <item quantity="one">裡面還有 <xliff:g id="NUMBER_0">%s</xliff:g> 個通知。</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"通知設定"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g>設定"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"螢幕會自動旋轉。"</string> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index 7764073a7df7..7f03c5d8e19e 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"有位置資訊要求"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"清除所有通知。"</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="other">群組中還有 <xliff:g id="NUMBER_1">%s</xliff:g> 則通知。</item> + <item quantity="one">群組中還有 <xliff:g id="NUMBER_0">%s</xliff:g> 則通知。</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"通知設定"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g>設定"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"螢幕會自動旋轉。"</string> diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml index 0fecc0a1ce9f..bedaeca11beb 100644 --- a/packages/SystemUI/res/values-zu/strings.xml +++ b/packages/SystemUI/res/values-zu/strings.xml @@ -245,6 +245,10 @@ <string name="accessibility_location_active" msgid="2427290146138169014">"Izicelo zendawo ziyasebenza"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Susa zonke izaziso."</string> <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> + <plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404"> + <item quantity="one"><xliff:g id="NUMBER_1">%s</xliff:g> izaziso eziningi ngaphakathi.</item> + <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> izaziso eziningi ngaphakathi.</item> + </plurals> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Izilungiselelo zesaziso"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> izilungiselelo"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Isikrini sizophenduka ngokuzenzakalela."</string> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index cbb3c0ab52c7..2a4752a6a086 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -138,6 +138,9 @@ <!-- Height of the status bar header bar when on Keyguard --> <dimen name="status_bar_header_height_keyguard">40dp</dimen> + <!-- Margin start of the system icons super container --> + <dimen name="system_icons_super_container_margin_start">16dp</dimen> + <!-- Width for the notification panel and related windows --> <dimen name="match_parent">-1px</dimen> <dimen name="standard_notification_panel_width">416dp</dimen> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 27585513bf71..f7a169cb4d5b 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -594,6 +594,12 @@ <!-- The overflow indicator shown when a group has more notification inside the group than the visible ones. An example is "+ 3" [CHAR LIMIT=5] --> <string name="notification_group_overflow_indicator">+ <xliff:g id="number" example="3">%s</xliff:g></string> + <!-- Content description describing how many more notifications are in a group [CHAR LIMIT=NONE] --> + <plurals name="notification_group_overflow_description"> + <item quantity="one"><xliff:g id="number" example="1">%s</xliff:g> more notification inside.</item> + <item quantity="other"><xliff:g id="number" example="3">%s</xliff:g> more notifications inside.</item> + </plurals> + <!-- Content description of button in notification inspector for system settings relating to notifications from this application [CHAR LIMIT=NONE] --> <string name="status_bar_notification_inspect_item_title">Notification settings</string> diff --git a/packages/SystemUI/src/com/android/systemui/qs/NonInterceptingScrollView.java b/packages/SystemUI/src/com/android/systemui/qs/NonInterceptingScrollView.java new file mode 100644 index 000000000000..c204d94916a4 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/qs/NonInterceptingScrollView.java @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the + * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.android.systemui.qs; + +import android.content.Context; +import android.util.AttributeSet; +import android.view.MotionEvent; +import android.widget.ScrollView; + +/** + * ScrollView that disallows intercepting for touches that can cause scrolling. + */ +public class NonInterceptingScrollView extends ScrollView { + + public NonInterceptingScrollView(Context context, AttributeSet attrs) { + super(context, attrs); + } + + @Override + public boolean onTouchEvent(MotionEvent ev) { + int action = ev.getActionMasked(); + switch (action) { + case MotionEvent.ACTION_DOWN: + if (canScrollVertically(1)) { + requestDisallowInterceptTouchEvent(true); + } + break; + } + return super.onTouchEvent(ev); + } +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java index f07e8fccd894..cf96457ce09c 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java +++ b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java @@ -31,6 +31,10 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { private View mDecorGroup; private PageListener mPageListener; + private int mPosition; + private boolean mOffPage; + private boolean mListening; + public PagedTileLayout(Context context, AttributeSet attrs) { super(context, attrs); setAdapter(mAdapter); @@ -48,6 +52,7 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { if (mPageIndicator == null) return; + setCurrentPage(position, positionOffset != 0); mPageIndicator.setLocation(position + positionOffset); if (mPageListener != null) { mPageListener.onPageChanged(positionOffsetPixels == 0 && @@ -78,6 +83,52 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout { } @Override + public void setListening(boolean listening) { + if (mListening == listening) return; + mListening = listening; + if (mListening) { + mPages.get(mPosition).setListening(listening); + if (mOffPage) { + mPages.get(mPosition + 1).setListening(listening); + } + } else { + // Make sure no pages are listening. + for (int i = 0; i < mPages.size(); i++) { + mPages.get(i).setListening(false); + } + } + } + + /** + * Sets individual pages to listening or not. If offPage it will set + * the next page after position to listening as well since we are in between + * pages. + */ + private void setCurrentPage(int position, boolean offPage) { + if (mPosition == position && mOffPage == offPage) return; + if (mListening) { + if (mPosition != position) { + // Clear out the last pages from listening. + mPages.get(mPosition).setListening(false); + if (mOffPage) { + mPages.get(mPosition + 1).setListening(false); + } + // Set the new pages to listening + mPages.get(position).setListening(true); + if (offPage) { + mPages.get(position + 1).setListening(true); + } + } else if (mOffPage != offPage) { + // Whether we are showing position + 1 has changed. + mPages.get(mPosition + 1).setListening(offPage); + } + } + // Save the current state. + mPosition = position; + mOffPage = offPage; + } + + @Override public boolean hasOverlappingRendering() { return false; } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSContainer.java b/packages/SystemUI/src/com/android/systemui/qs/QSContainer.java index ef7556267e0c..8d6e17e2622b 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSContainer.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSContainer.java @@ -60,6 +60,7 @@ public class QSContainer extends FrameLayout { private QSAnimator mQSAnimator; private QSCustomizer mQSCustomizer; private NotificationPanelView mPanelView; + private boolean mListening; public QSContainer(Context context, AttributeSet attrs) { super(context, attrs); @@ -209,6 +210,7 @@ public class QSContainer extends FrameLayout { public void setExpanded(boolean expanded) { if (DEBUG) Log.d(TAG, "setExpanded " + expanded); mQsExpanded = expanded; + mQSPanel.setListening(mListening && mQsExpanded); updateQsState(); } @@ -227,8 +229,9 @@ public class QSContainer extends FrameLayout { public void setListening(boolean listening) { if (DEBUG) Log.d(TAG, "setListening " + listening); - mQSPanel.setListening(listening); + mListening = listening; mHeader.setListening(listening); + mQSPanel.setListening(mListening && mQsExpanded); } public void setQsExpansion(float expansion, float headerTranslation) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSIconView.java b/packages/SystemUI/src/com/android/systemui/qs/QSIconView.java index 6c224f70f42f..9c4a1498e9e5 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSIconView.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSIconView.java @@ -80,7 +80,7 @@ public class QSIconView extends ViewGroup { Drawable d = state.icon != null ? iv.isShown() && mAnimationEnabled ? state.icon.getDrawable(mContext) : state.icon.getInvisibleDrawable(mContext) : null; - int padding = state.icon != null ? state.icon.getPadding() : null; + int padding = state.icon != null ? state.icon.getPadding() : 0; if (d != null && state.autoMirrorDrawable) { d.setAutoMirrored(true); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java index 0e8d76ac50bd..6945176be7d3 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java @@ -57,7 +57,7 @@ public class QSPanel extends LinearLayout implements Tunable, Callback { private int mPanelPaddingBottom; private int mBrightnessPaddingTop; private boolean mExpanded; - private boolean mListening; + protected boolean mListening; private Callback mCallback; private BrightnessController mBrightnessController; @@ -102,6 +102,7 @@ public class QSPanel extends LinearLayout implements Tunable, Callback { protected void setupTileLayout() { mTileLayout = (QSTileLayout) LayoutInflater.from(mContext).inflate( R.layout.qs_paged_tile_layout, this, false); + mTileLayout.setListening(mListening); addView((View) mTileLayout); findViewById(android.R.id.edit).setOnClickListener(view -> mHost.startRunnableDismissingKeyguard(() -> showEdit(view))); @@ -230,8 +231,8 @@ public class QSPanel extends LinearLayout implements Tunable, Callback { public void setListening(boolean listening) { if (mListening == listening) return; mListening = listening; - for (TileRecord r : mRecords) { - r.tile.setListening(mListening); + if (mTileLayout != null) { + mTileLayout.setListening(listening); } mFooter.setListening(mListening); if (mListening) { @@ -343,7 +344,6 @@ public class QSPanel extends LinearLayout implements Tunable, Callback { } }; r.tileView.init(click, longClick); - r.tile.setListening(mListening); callback.onStateChanged(r.tile.getState()); r.tile.refreshState(); mRecords.add(r); @@ -533,5 +533,7 @@ public class QSPanel extends LinearLayout implements Tunable, Callback { void removeTile(TileRecord tile); int getOffsetTop(TileRecord tile); boolean updateResources(); + + void setListening(boolean listening); } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java index 0cc30a8642ea..8d9f23fb9242 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java @@ -24,6 +24,7 @@ import android.graphics.drawable.Drawable; import android.os.Handler; import android.os.Looper; import android.os.Message; +import android.util.ArraySet; import android.util.Log; import android.util.SparseArray; import android.view.View; @@ -63,7 +64,7 @@ import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; * handleUpdateState. Callbacks affecting state should use refreshState to trigger another * state update pass on tile looper. */ -public abstract class QSTile<TState extends State> implements Listenable { +public abstract class QSTile<TState extends State> { protected final String TAG = "Tile." + getClass().getSimpleName(); protected static final boolean DEBUG = Log.isLoggable("Tile", Log.DEBUG); @@ -71,6 +72,7 @@ public abstract class QSTile<TState extends State> implements Listenable { protected final Context mContext; protected final H mHandler; protected final Handler mUiHandler = new Handler(Looper.getMainLooper()); + private final ArraySet<Object> mListeners = new ArraySet<>(); private final ArrayList<Callback> mCallbacks = new ArrayList<>(); protected TState mState = newTileState(); @@ -97,6 +99,24 @@ public abstract class QSTile<TState extends State> implements Listenable { mHandler = new H(host.getLooper()); } + /** + * Adds or removes a listening client for the tile. If the tile has one or more + * listening client it will go into the listening state. + */ + public void setListening(Object listener, boolean listening) { + if (listening) { + if (mListeners.add(listener) && mListeners.size() == 1) { + if (DEBUG) Log.d(TAG, "setListening " + true); + mHandler.obtainMessage(H.SET_LISTENING, 1, 0).sendToTarget(); + } + } else { + if (mListeners.remove(listener) && mListeners.size() == 0) { + if (DEBUG) Log.d(TAG, "setListening " + false); + mHandler.obtainMessage(H.SET_LISTENING, 0, 0).sendToTarget(); + } + } + } + public String getTileSpec() { return mTileSpec; } @@ -279,6 +299,8 @@ public abstract class QSTile<TState extends State> implements Listenable { handleRefreshState(null); } + protected abstract void setListening(boolean listening); + protected void handleDestroy() { setListening(false); mCallbacks.clear(); @@ -312,6 +334,7 @@ public abstract class QSTile<TState extends State> implements Listenable { private static final int DESTROY = 10; private static final int CLEAR_STATE = 11; private static final int REMOVE_CALLBACKS = 12; + private static final int SET_LISTENING = 13; private H(Looper looper) { super(looper); @@ -364,6 +387,9 @@ public abstract class QSTile<TState extends State> implements Listenable { } else if (msg.what == CLEAR_STATE) { name = "handleClearState"; handleClearState(); + } else if (msg.what == SET_LISTENING) { + name = "setListening"; + setListening(msg.arg1 != 0); } else { throw new IllegalArgumentException("Unknown msg: " + msg.what); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTileBaseView.java b/packages/SystemUI/src/com/android/systemui/qs/QSTileBaseView.java index f05aa3cdd89c..feacaa02550b 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSTileBaseView.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSTileBaseView.java @@ -154,9 +154,9 @@ public class QSTileBaseView extends LinearLayout { event.setClassName(mAccessibilityClass); if (Switch.class.getName().equals(mAccessibilityClass)) { String label = getResources() - .getString(mTileState ? R.string.switch_bar_on : R.string.switch_bar_off); + .getString(!mTileState ? R.string.switch_bar_on : R.string.switch_bar_off); event.setContentDescription(label); - event.setChecked(mTileState); + event.setChecked(!mTileState); } } } diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java index 4accc8b7d1ef..b28d0f200e2a 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java @@ -55,6 +55,7 @@ public class QuickQSPanel extends QSPanel { removeView((View) mTileLayout); } mTileLayout = new HeaderTileLayout(context); + mTileLayout.setListening(mListening); addView((View) mTileLayout, 1 /* Between brightness and footer */); } @@ -147,6 +148,7 @@ public class QuickQSPanel extends QSPanel { private final Space mEndSpacer; protected final ArrayList<TileRecord> mRecords = new ArrayList<>(); + private boolean mListening; public HeaderTileLayout(Context context) { super(context); @@ -176,6 +178,15 @@ public class QuickQSPanel extends QSPanel { } @Override + public void setListening(boolean listening) { + if (mListening == listening) return; + mListening = listening; + for (TileRecord record : mRecords) { + record.tile.setListening(this, mListening); + } + } + + @Override public void addTile(TileRecord tile) { addView(tile.tileView, getChildCount() - 1 /* Leave icon at end */, generateLayoutParams()); @@ -183,6 +194,7 @@ public class QuickQSPanel extends QSPanel { addView(new Space(mContext), getChildCount() - 1 /* Leave icon at end */, generateSpaceParams()); mRecords.add(tile); + tile.tile.setListening(this, mListening); } private LayoutParams generateSpaceParams() { @@ -208,6 +220,7 @@ public class QuickQSPanel extends QSPanel { // Remove its spacer as well. removeViewAt(childIndex); mRecords.remove(tile); + tile.tile.setListening(this, false); } private int getChildIndex(QSTileBaseView tileView) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/TileLayout.java b/packages/SystemUI/src/com/android/systemui/qs/TileLayout.java index a578e6c9cb9e..a5a1eaaf6662 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/TileLayout.java +++ b/packages/SystemUI/src/com/android/systemui/qs/TileLayout.java @@ -25,6 +25,7 @@ public class TileLayout extends ViewGroup implements QSTileLayout { protected final ArrayList<TileRecord> mRecords = new ArrayList<>(); private int mCellMarginTop; + private boolean mListening; public TileLayout(Context context) { this(context, null); @@ -41,18 +42,32 @@ public class TileLayout extends ViewGroup implements QSTileLayout { return getTop(); } + @Override + public void setListening(boolean listening) { + if (mListening == listening) return; + mListening = listening; + for (TileRecord record : mRecords) { + record.tile.setListening(this, mListening); + } + } + public void addTile(TileRecord tile) { mRecords.add(tile); + tile.tile.setListening(this, mListening); addView(tile.tileView); } @Override public void removeTile(TileRecord tile) { mRecords.remove(tile); + tile.tile.setListening(this, false); removeView(tile.tileView); } public void removeAllViews() { + for (TileRecord record : mRecords) { + record.tile.setListening(this, false); + } mRecords.clear(); super.removeAllViews(); } diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/CustomizeTileView.java b/packages/SystemUI/src/com/android/systemui/qs/customize/CustomizeTileView.java index e512f93f2ced..26fc6dfdd922 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/customize/CustomizeTileView.java +++ b/packages/SystemUI/src/com/android/systemui/qs/customize/CustomizeTileView.java @@ -26,7 +26,7 @@ import libcore.util.Objects; public class CustomizeTileView extends QSTileView { private TextView mAppLabel; - + private int mLabelMinLines; public CustomizeTileView(Context context, QSIconView icon) { super(context, icon); } @@ -34,6 +34,7 @@ public class CustomizeTileView extends QSTileView { @Override protected void createLabel() { super.createLabel(); + mLabelMinLines = mLabel.getMinLines(); View view = LayoutInflater.from(mContext).inflate(R.layout.qs_tile_label, null); mAppLabel = (TextView) view.findViewById(R.id.tile_label); mAppLabel.setAlpha(.6f); @@ -44,6 +45,9 @@ public class CustomizeTileView extends QSTileView { public void setShowAppLabel(boolean showAppLabel) { mAppLabel.setVisibility(showAppLabel ? View.VISIBLE : View.GONE); mLabel.setSingleLine(showAppLabel); + if (!showAppLabel) { + mLabel.setMinLines(mLabelMinLines); + } } public void setAppLabel(CharSequence label) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java b/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java index fb76918c644d..8ec6a2f66e1a 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java +++ b/packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java @@ -66,10 +66,10 @@ public class TileQueryHelper { if (tile == null || !tile.isAvailable()) { continue; } - tile.setListening(true); + tile.setListening(this, true); tile.clearState(); tile.refreshState(); - tile.setListening(false); + tile.setListening(this, false); qsHandler.post(new Runnable() { @Override public void run() { diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java index 3587262400d5..1c134c1e1424 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java @@ -16,15 +16,22 @@ package com.android.systemui.qs.tiles; +import android.content.BroadcastReceiver; +import android.content.Context; import android.content.Intent; +import android.content.IntentFilter; import android.os.UserManager; import android.provider.Settings; +import android.provider.Settings.Global; +import android.text.SpannableStringBuilder; +import android.text.style.ForegroundColorSpan; import android.widget.Switch; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.systemui.R; +import com.android.systemui.qs.GlobalSetting; import com.android.systemui.qs.QSTile; import com.android.systemui.statusbar.policy.HotspotController; @@ -36,12 +43,22 @@ public class HotspotTile extends QSTile<QSTile.BooleanState> { private final AnimationIcon mDisable = new AnimationIcon(R.drawable.ic_hotspot_disable_animation, R.drawable.ic_hotspot_enable); + private final Icon mUnavailable = + ResourceIcon.get(R.drawable.ic_hotspot_unavailable); private final HotspotController mController; private final Callback mCallback = new Callback(); + private final GlobalSetting mAirplaneMode; + private boolean mListening; public HotspotTile(Host host) { super(host); mController = host.getHotspotController(); + mAirplaneMode = new GlobalSetting(mContext, mHandler, Global.AIRPLANE_MODE_ON) { + @Override + protected void handleValueChanged(int value) { + refreshState(); + } + }; } @Override @@ -61,11 +78,18 @@ public class HotspotTile extends QSTile<QSTile.BooleanState> { @Override public void setListening(boolean listening) { + if (mListening == listening) return; + mListening = listening; if (listening) { mController.addCallback(mCallback); + final IntentFilter filter = new IntentFilter(); + filter.addAction(Intent.ACTION_AIRPLANE_MODE_CHANGED); + mContext.registerReceiver(mReceiver, filter); } else { mController.removeCallback(mCallback); + mContext.unregisterReceiver(mReceiver); } + mAirplaneMode.setListening(listening); } @Override @@ -76,6 +100,9 @@ public class HotspotTile extends QSTile<QSTile.BooleanState> { @Override protected void handleClick() { final boolean isEnabled = (Boolean) mState.value; + if (!isEnabled && mAirplaneMode.getValue() != 0) { + return; + } MetricsLogger.action(mContext, getMetricsCategory(), !isEnabled); mController.setHotspotEnabled(!isEnabled); } @@ -96,6 +123,13 @@ public class HotspotTile extends QSTile<QSTile.BooleanState> { state.value = mController.isHotspotEnabled(); } state.icon = state.value ? mEnable : mDisable; + if (mAirplaneMode.getValue() != 0) { + final int disabledColor = mHost.getContext().getColor(R.color.qs_tile_tint_unavailable); + state.label = new SpannableStringBuilder().append(state.label, + new ForegroundColorSpan(disabledColor), + SpannableStringBuilder.SPAN_INCLUSIVE_INCLUSIVE); + state.icon = mUnavailable; + } state.minimalAccessibilityClassName = state.expandedAccessibilityClassName = Switch.class.getName(); state.contentDescription = state.label; @@ -121,4 +155,13 @@ public class HotspotTile extends QSTile<QSTile.BooleanState> { refreshState(enabled); } }; + + private final BroadcastReceiver mReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + if (Intent.ACTION_AIRPLANE_MODE_CHANGED.equals(intent.getAction())) { + refreshState(); + } + } + }; } diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsDebugFlags.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsDebugFlags.java index 171535691bbc..bb8bfee11cc9 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsDebugFlags.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsDebugFlags.java @@ -35,7 +35,7 @@ public class RecentsDebugFlags implements TunerService.Tunable { public static final boolean DisableBackgroundCache = false; // Enables the task affiliations public static final boolean EnableAffiliatedTaskGroups = false; - // TODO: To be repurposed + // Enables the button above the stack public static final boolean EnableStackActionButton = true; // Overrides the Tuner flags and enables the timeout private static final boolean EnableFastToggleTimeout = false; diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java index cfc6c52e608b..b20f46f6b1f5 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java @@ -372,7 +372,7 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener if (stack.getTaskCount() > 0) { // Only preload the icon (but not the thumbnail since it may not have been taken for // the pausing activity) - preloadIcon(runningTask); + preloadIcon(runningTask.id); // At this point, we don't know anything about the stack state. So only calculate // the dimensions of the thumbnail that we need for the transition into Recents, but @@ -664,10 +664,10 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener /** * Preloads the icon of a task. */ - private void preloadIcon(ActivityManager.RunningTaskInfo task) { + private void preloadIcon(int runningTaskId) { // Ensure that we load the running task's icon RecentsTaskLoadPlan.Options launchOpts = new RecentsTaskLoadPlan.Options(); - launchOpts.runningTaskId = task.id; + launchOpts.runningTaskId = runningTaskId; launchOpts.loadThumbnails = false; launchOpts.onlyLoadForCache = true; Recents.getTaskLoader().loadTasks(mContext, sInstanceLoadPlan, launchOpts); @@ -699,7 +699,7 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener private ActivityOptions getThumbnailTransitionActivityOptions( ActivityManager.RunningTaskInfo runningTask, TaskStackView stackView, Rect windowOverrideRect) { - if (runningTask.stackId == FREEFORM_WORKSPACE_STACK_ID) { + if (runningTask != null && runningTask.stackId == FREEFORM_WORKSPACE_STACK_ID) { ArrayList<AppTransitionAnimationSpec> specs = new ArrayList<>(); ArrayList<Task> tasks = stackView.getStack().getStackTasks(); TaskStackLayoutAlgorithm stackLayout = stackView.getStackAlgorithm(); @@ -810,6 +810,10 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener RecentsTaskLoader loader = Recents.getTaskLoader(); RecentsActivityLaunchState launchState = Recents.getConfiguration().getLaunchState(); + int runningTaskId = !mLaunchedWhileDocking && (runningTask != null) + ? runningTask.id + : -1; + // In the case where alt-tab is triggered, we never get a preloadRecents() call, so we // should always preload the tasks now. If we are dragging in recents, reload them as // the stacks might have changed. @@ -818,7 +822,7 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener sInstanceLoadPlan = loader.createLoadPlan(mContext); } if (mLaunchedWhileDocking || mTriggeredFromAltTab || !sInstanceLoadPlan.hasTasks()) { - loader.preloadTasks(sInstanceLoadPlan, runningTask.id, !isHomeStackVisible); + loader.preloadTasks(sInstanceLoadPlan, runningTaskId, !isHomeStackVisible); } TaskStack stack = sInstanceLoadPlan.getTaskStack(); @@ -830,12 +834,12 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener launchState.launchedFromApp = useThumbnailTransition || mLaunchedWhileDocking; launchState.launchedViaDockGesture = mLaunchedWhileDocking; launchState.launchedViaDragGesture = mDraggingInRecents; - launchState.launchedToTaskId = (runningTask != null) ? runningTask.id : -1; + launchState.launchedToTaskId = runningTaskId; launchState.launchedWithAltTab = mTriggeredFromAltTab; // Preload the icon (this will be a null-op if we have preloaded the icon already in // preloadRecents()) - preloadIcon(runningTask); + preloadIcon(runningTaskId); // Update the header bar if necessary Rect windowOverrideRect = getWindowRectOverride(growTarget); diff --git a/packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java b/packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java index 50e28ca2205d..26200d0fac47 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java +++ b/packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java @@ -228,8 +228,8 @@ public class TaskStack { /** * Notifies when a task has been removed from the stack. */ - void onStackTaskRemoved(TaskStack stack, Task removedTask, boolean wasFrontMostTask, - Task newFrontMostTask, AnimationProps animation, boolean fromDockGesture); + void onStackTaskRemoved(TaskStack stack, Task removedTask, Task newFrontMostTask, + AnimationProps animation, boolean fromDockGesture); /** * Notifies when all tasks have been removed from the stack. @@ -609,12 +609,11 @@ public class TaskStack { */ public void removeTask(Task t, AnimationProps animation, boolean fromDockGesture) { if (mStackTaskList.contains(t)) { - boolean wasFrontMostTask = (getStackFrontMostTask(false /* includeFreeform */) == t); removeTaskImpl(mStackTaskList, t); Task newFrontMostTask = getStackFrontMostTask(false /* includeFreeform */); if (mCb != null) { // Notify that a task has been removed - mCb.onStackTaskRemoved(this, t, wasFrontMostTask, newFrontMostTask, animation, + mCb.onStackTaskRemoved(this, t, newFrontMostTask, animation, fromDockGesture); } } @@ -648,6 +647,7 @@ public class TaskStack { ArrayMap<Task.TaskKey, Task> currentTasksMap = createTaskKeyMapFromList(mRawTaskList); ArrayMap<Task.TaskKey, Task> newTasksMap = createTaskKeyMapFromList(tasks); ArrayList<Task> addedTasks = new ArrayList<>(); + ArrayList<Task> removedTasks = new ArrayList<>(); ArrayList<Task> allTasks = new ArrayList<>(); // Disable notifications if there are no callbacks @@ -661,11 +661,7 @@ public class TaskStack { Task task = mRawTaskList.get(i); if (!newTasksMap.containsKey(task.key)) { if (notifyStackChanges) { - // If we are notifying, then remove the task now, otherwise the raw task list - // will be reset at the end of this method - removeTask(task, AnimationProps.IMMEDIATE, false /* fromDockGesture */); - mCb.onStackTaskRemoved(this, task, i == (taskCount - 1), null, - AnimationProps.IMMEDIATE, false /* fromDockGesture */); + removedTasks.add(task); } } task.setGroup(null); @@ -699,6 +695,14 @@ public class TaskStack { // Update the affiliated groupings createAffiliatedGroupings(context); + // Only callback for the removed tasks after the stack has updated + int removedTaskCount = removedTasks.size(); + Task newFrontMostTask = getStackFrontMostTask(false); + for (int i = 0; i < removedTaskCount; i++) { + mCb.onStackTaskRemoved(this, removedTasks.get(i), newFrontMostTask, + AnimationProps.IMMEDIATE, false /* fromDockGesture */); + } + // Only callback for the newly added tasks after this stack has been updated int addedTaskCount = addedTasks.size(); for (int i = 0; i < addedTaskCount; i++) { diff --git a/packages/SystemUI/src/com/android/systemui/recents/tv/RecentsTvActivity.java b/packages/SystemUI/src/com/android/systemui/recents/tv/RecentsTvActivity.java index 1a559585e5c0..ecb12d3c9c5c 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/tv/RecentsTvActivity.java +++ b/packages/SystemUI/src/com/android/systemui/recents/tv/RecentsTvActivity.java @@ -81,6 +81,7 @@ public class RecentsTvActivity extends Activity implements OnPreDrawListener { private long mLastTabKeyEventTime; private boolean mIgnoreAltTabRelease; private boolean mLaunchedFromHome; + private boolean mTalkBackEnabled; private RecentsTvView mRecentsView; private View mPipView; @@ -133,15 +134,22 @@ public class RecentsTvActivity extends Activity implements OnPreDrawListener { @Override public void onRecentsFocused() { - mRecentsView.requestFocus(); - mRecentsView.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED); + if (mTalkBackEnabled) { + mTaskStackHorizontalGridView.requestFocus(); + mTaskStackHorizontalGridView.sendAccessibilityEvent( + AccessibilityEvent.TYPE_VIEW_FOCUSED); + } + mTaskStackHorizontalGridView.startFocusGainAnimation(); } }; + private final View.OnFocusChangeListener mPipViewFocusChangeListener = new View.OnFocusChangeListener() { @Override public void onFocusChange(View v, boolean hasFocus) { - handlePipViewFocusChange(hasFocus); + if (hasFocus) { + requestPipControlsFocus(); + } } }; @@ -194,17 +202,18 @@ public class RecentsTvActivity extends Activity implements OnPreDrawListener { loadOpts.numVisibleTaskThumbnails = numVisibleTasks; loader.loadTasks(this, plan, loadOpts); - - mRecentsView.setTaskStack(stack); List stackTasks = stack.getStackTasks(); Collections.reverse(stackTasks); if (mTaskStackViewAdapter == null) { mTaskStackViewAdapter = new TaskStackHorizontalViewAdapter(stackTasks); mTaskStackHorizontalGridView = mRecentsView .setTaskStackViewAdapter(mTaskStackViewAdapter); + mHomeRecentsEnterExitAnimationHolder = new HomeRecentsEnterExitAnimationHolder( + getApplicationContext(), mTaskStackHorizontalGridView); } else { mTaskStackViewAdapter.setNewStackTasks(stackTasks); } + mRecentsView.init(stack); if (launchState.launchedToTaskId != -1) { ArrayList<Task> tasks = stack.getStackTasks(); @@ -305,6 +314,7 @@ public class RecentsTvActivity extends Activity implements OnPreDrawListener { View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION); mPipView = findViewById(R.id.pip); + mPipView.setOnFocusChangeListener(mPipViewFocusChangeListener); // Place mPipView at the PIP bounds for fine tuned focus handling. Rect pipBounds = mPipManager.getRecentsFocusedPipBounds(); LayoutParams lp = (LayoutParams) mPipView.getLayoutParams(); @@ -342,7 +352,6 @@ public class RecentsTvActivity extends Activity implements OnPreDrawListener { if(mLaunchedFromHome) { mHomeRecentsEnterExitAnimationHolder.startEnterAnimation(mPipManager.isPipShown()); } - mTaskStackViewAdapter.setResetAddedCards(true); EventBus.getDefault().send(new EnterRecentsWindowAnimationCompletedEvent()); } @@ -353,19 +362,6 @@ public class RecentsTvActivity extends Activity implements OnPreDrawListener { // Update the recent tasks updateRecentsTasks(); - mHomeRecentsEnterExitAnimationHolder = new HomeRecentsEnterExitAnimationHolder( - getApplicationContext(), mTaskStackHorizontalGridView); - if(mTaskStackHorizontalGridView != null && - mTaskStackHorizontalGridView.getChildCount() > 0) { - if(mLaunchedFromHome) { - mHomeRecentsEnterExitAnimationHolder.setEnterFromHomeStartingAnimationValues(); - } else { - mHomeRecentsEnterExitAnimationHolder.setEnterFromAppStartingAnimationValues(); - } - } else { - mRecentsView.getViewTreeObserver().addOnPreDrawListener(this); - } - // If this is a new instance from a configuration change, then we have to manually trigger // the enter animation state, or if recents was relaunched by AM, without going through // the normal mechanisms @@ -387,9 +383,11 @@ public class RecentsTvActivity extends Activity implements OnPreDrawListener { } else { mTaskStackHorizontalGridView.setSelectedPosition(0); } + mRecentsView.getViewTreeObserver().addOnPreDrawListener(this); View dismissPlaceholder = findViewById(R.id.dismiss_placeholder); - if (ssp.isTouchExplorationEnabled()) { + mTalkBackEnabled = ssp.isTouchExplorationEnabled(); + if (mTalkBackEnabled) { dismissPlaceholder.setAccessibilityTraversalBefore(R.id.task_list); dismissPlaceholder.setAccessibilityTraversalAfter(R.id.dismiss_placeholder); mTaskStackHorizontalGridView.setAccessibilityTraversalAfter(R.id.dismiss_placeholder); @@ -408,14 +406,29 @@ public class RecentsTvActivity extends Activity implements OnPreDrawListener { } }); } - updatePipUI(); + + // Initialize PIP UI + if (mPipManager.isPipShown()) { + if (mTalkBackEnabled) { + // If talkback is on, use the mPipView to handle focus changes + // between recents row and PIP controls. + mPipView.setVisibility(View.VISIBLE); + } else { + mPipView.setVisibility(View.GONE); + } + // When PIP view has focus, recents overlay view will takes the focus + // as if it's the part of the Recents UI. + mPipRecentsOverlayManager.requestFocus(mTaskStackViewAdapter.getItemCount() > 0); + } else { + mPipView.setVisibility(View.GONE); + mPipRecentsOverlayManager.removePipRecentsOverlayView(); + } } @Override public void onPause() { super.onPause(); mPipRecentsOverlayManager.onRecentsPaused(); - mTaskStackViewAdapter.setResetAddedCards(false); } @Override @@ -534,6 +547,7 @@ public class RecentsTvActivity extends Activity implements OnPreDrawListener { public final void onBusEvent(AllTaskViewsDismissedEvent event) { if (mPipManager.isPipShown()) { mRecentsView.showEmptyView(); + mPipRecentsOverlayManager.requestFocus(false); } else { dismissRecentsToHome(false); } @@ -547,10 +561,14 @@ public class RecentsTvActivity extends Activity implements OnPreDrawListener { @Override public boolean onPreDraw() { mRecentsView.getViewTreeObserver().removeOnPreDrawListener(this); - if(mLaunchedFromHome) { - mHomeRecentsEnterExitAnimationHolder.setEnterFromHomeStartingAnimationValues(); + // Sets the initial values for enter animation. + // Animation will be started in {@link #onEnterAnimationComplete()} + if (mLaunchedFromHome) { + mHomeRecentsEnterExitAnimationHolder + .setEnterFromHomeStartingAnimationValues(mPipManager.isPipShown()); } else { - mHomeRecentsEnterExitAnimationHolder.setEnterFromAppStartingAnimationValues(); + mHomeRecentsEnterExitAnimationHolder + .setEnterFromAppStartingAnimationValues(mPipManager.isPipShown()); } // We post to make sure that this information is delivered after this traversals is // finished. @@ -564,35 +582,25 @@ public class RecentsTvActivity extends Activity implements OnPreDrawListener { } private void updatePipUI() { - if (mPipManager.isPipShown()) { - mPipView.setVisibility(View.VISIBLE); - mPipView.setOnFocusChangeListener(mPipViewFocusChangeListener); - if (mPipView.hasFocus()) { - // This can happen only if the activity is resumed. Ask for reset. - handlePipViewFocusChange(true); - } else { - mPipView.requestFocus(); - } - } else { - mPipView.setVisibility(View.GONE); + if (!mPipManager.isPipShown()) { mPipRecentsOverlayManager.removePipRecentsOverlayView(); + mTaskStackHorizontalGridView.startFocusLossAnimation(); + } else { + Log.w(TAG, "An activity entered PIP mode while Recents is shown"); } } /** - * Handles the PIP view's focus change. + * Requests the focus to the PIP controls. * This starts the relevant recents row animation * and give focus to the recents overlay if needed. */ - private void handlePipViewFocusChange(boolean hasFocus) { - mRecentsView.startRecentsRowFocusAnimation(!hasFocus); - if (hasFocus) { - // When PIP view has focus, recents overlay view will takes the focus - // as if it's the part of the Recents UI. - mPipRecentsOverlayManager.requestFocus( - mTaskStackViewAdapter.getItemCount() > 0); - } else { - mPipRecentsOverlayManager.clearFocus(); + public void requestPipControlsFocus() { + if (!mPipManager.isPipShown()) { + return; } + + mTaskStackHorizontalGridView.startFocusLossAnimation(); + mPipRecentsOverlayManager.requestFocus(mTaskStackViewAdapter.getItemCount() > 0); } } diff --git a/packages/SystemUI/src/com/android/systemui/recents/tv/animations/HomeRecentsEnterExitAnimationHolder.java b/packages/SystemUI/src/com/android/systemui/recents/tv/animations/HomeRecentsEnterExitAnimationHolder.java index 92718a3b5ac1..9faaa4bdccb6 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/tv/animations/HomeRecentsEnterExitAnimationHolder.java +++ b/packages/SystemUI/src/com/android/systemui/recents/tv/animations/HomeRecentsEnterExitAnimationHolder.java @@ -74,19 +74,35 @@ public class HomeRecentsEnterExitAnimationHolder { } } - public void setEnterFromHomeStartingAnimationValues() { + /** + * Sets the initial values Recents enter animation + * when Recents is started from the Launcher. + */ + public void setEnterFromHomeStartingAnimationValues(boolean isPipShown) { for(int i = 0; i < mGridView.getChildCount(); i++) { TaskCardView view = (TaskCardView) mGridView.getChildAt(i); view.setTranslationX(0); view.setAlpha(0.0f); + view.getInfoFieldView().setAlpha(isPipShown ? 0 : 1f); + if (isPipShown && view.hasFocus()) { + view.getViewFocusAnimator().changeSize(false); + } } } - public void setEnterFromAppStartingAnimationValues() { + /** + * Sets the initial values Recents enter animation + * when Recents is started from an app. + */ + public void setEnterFromAppStartingAnimationValues(boolean isPipShown) { for(int i = 0; i < mGridView.getChildCount(); i++) { TaskCardView view = (TaskCardView) mGridView.getChildAt(i); view.setTranslationX(0); - view.setAlpha(1.0f); + view.setAlpha(isPipShown ? mDimAlpha : 1f); + view.getInfoFieldView().setAlpha(isPipShown ? 0 : 1f); + if (isPipShown && view.hasFocus()) { + view.getViewFocusAnimator().changeSize(false); + } } } } diff --git a/packages/SystemUI/src/com/android/systemui/recents/tv/animations/RecentsRowFocusAnimationHolder.java b/packages/SystemUI/src/com/android/systemui/recents/tv/animations/RecentsRowFocusAnimationHolder.java index 45c15379485b..8a4cf399b813 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/tv/animations/RecentsRowFocusAnimationHolder.java +++ b/packages/SystemUI/src/com/android/systemui/recents/tv/animations/RecentsRowFocusAnimationHolder.java @@ -29,11 +29,11 @@ import com.android.systemui.recents.tv.views.TaskCardView; * Recents row's focus animation with PIP controls. */ public class RecentsRowFocusAnimationHolder { - private View mView; - private View mTitleView; + private final View mView; + private final View mTitleView; private AnimatorSet mFocusGainAnimatorSet; - private AnimatorSet mFocusLoseAnimatorSet; + private AnimatorSet mFocusLossAnimatorSet; public RecentsRowFocusAnimationHolder(View view, View titleView) { mView = view; @@ -50,28 +50,45 @@ public class RecentsRowFocusAnimationHolder { mFocusGainAnimatorSet.setDuration(duration); mFocusGainAnimatorSet.setInterpolator(Interpolators.FAST_OUT_SLOW_IN); - mFocusLoseAnimatorSet = new AnimatorSet(); - mFocusLoseAnimatorSet.playTogether( + mFocusLossAnimatorSet = new AnimatorSet(); + mFocusLossAnimatorSet.playTogether( // Animation doesn't start from the current value (1f) sometimes, // so specify the desired initial value here. ObjectAnimator.ofFloat(mView, "alpha", 1f, dimAlpha), ObjectAnimator.ofFloat(mTitleView, "alpha", 0f)); - mFocusLoseAnimatorSet.setDuration(duration); - mFocusLoseAnimatorSet.setInterpolator(Interpolators.FAST_OUT_SLOW_IN); + mFocusLossAnimatorSet.setDuration(duration); + mFocusLossAnimatorSet.setInterpolator(Interpolators.FAST_OUT_SLOW_IN); } /** - * Returns the Recents row's focus change animation. + * Starts the Recents row's focus gain animation. */ - public Animator getFocusChangeAnimator(boolean hasFocus) { - return hasFocus ? mFocusGainAnimatorSet : mFocusLoseAnimatorSet; + public void startFocusGainAnimation() { + cancelAnimator(mFocusLossAnimatorSet); + mFocusGainAnimatorSet.start(); } /** - * Resets the views to the initial state immediately. + * Starts the Recents row's focus loss animation. + */ + public void startFocusLossAnimation() { + cancelAnimator(mFocusGainAnimatorSet); + mFocusLossAnimatorSet.start(); + } + + /** + * Resets the views immediately and ends the animations. */ public void reset() { + cancelAnimator(mFocusLossAnimatorSet); + cancelAnimator(mFocusGainAnimatorSet); mView.setAlpha(1f); mTitleView.setAlpha(1f); } + + private static void cancelAnimator(Animator animator) { + if (animator.isStarted()) { + animator.cancel(); + } + } } diff --git a/packages/SystemUI/src/com/android/systemui/recents/tv/animations/ViewFocusAnimator.java b/packages/SystemUI/src/com/android/systemui/recents/tv/animations/ViewFocusAnimator.java index 82185990c828..72fd7a4114ac 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/tv/animations/ViewFocusAnimator.java +++ b/packages/SystemUI/src/com/android/systemui/recents/tv/animations/ViewFocusAnimator.java @@ -89,7 +89,7 @@ public class ViewFocusAnimator implements View.OnFocusChangeListener { }); } - public void setFocusProgress(float level) { + private void setFocusProgress(float level) { mFocusProgress = level; float scale = mUnselectedScale + (level * mSelectedScaleDelta); @@ -107,33 +107,19 @@ public class ViewFocusAnimator implements View.OnFocusChangeListener { mTargetView.getDismissIconView().setZ(z); } - public float getFocusProgress() { - return mFocusProgress; - } - - public void animateFocus(boolean focused) { + private void animateFocus(boolean focused) { if (mFocusAnimation.isStarted()) { mFocusAnimation.cancel(); } float target = focused ? 1.0f : 0.0f; - if (getFocusProgress() != target) { - mFocusAnimation.setFloatValues(getFocusProgress(), target); + if (mFocusProgress != target) { + mFocusAnimation.setFloatValues(mFocusProgress, target); mFocusAnimation.start(); } } - public void setFocusImmediate(boolean focused) { - if (mFocusAnimation.isStarted()) { - mFocusAnimation.cancel(); - } - - float target = focused ? 1.0f : 0.0f; - - setFocusProgress(target); - } - @Override public void onFocusChange(View v, boolean hasFocus) { if (v != mTargetView) { @@ -142,21 +128,27 @@ public class ViewFocusAnimator implements View.OnFocusChangeListener { changeSize(hasFocus); } - protected void changeSize(boolean hasFocus) { + /** + * Changes the size of the {@link TaskCardView} to show its focused state. + */ + public void changeSize(boolean hasFocus) { ViewGroup.LayoutParams lp = mTargetView.getLayoutParams(); int width = lp.width; int height = lp.height; if (width < 0 && height < 0) { mTargetView.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED); - height = mTargetView.getMeasuredHeight(); } if (mTargetView.isAttachedToWindow() && mTargetView.hasWindowFocus() && mTargetView.getVisibility() == View.VISIBLE) { animateFocus(hasFocus); } else { - setFocusImmediate(hasFocus); + // Set focus immediately. + if (mFocusAnimation.isStarted()) { + mFocusAnimation.cancel(); + } + setFocusProgress(hasFocus ? 1.0f : 0.0f); } } } diff --git a/packages/SystemUI/src/com/android/systemui/recents/tv/views/RecentsTvView.java b/packages/SystemUI/src/com/android/systemui/recents/tv/views/RecentsTvView.java index 06b24418a572..318b7f91fabf 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/tv/views/RecentsTvView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/tv/views/RecentsTvView.java @@ -59,7 +59,7 @@ public class RecentsTvView extends FrameLayout { private boolean mAwaitingFirstLayout = true; private Rect mSystemInsets = new Rect(); private RecentsTvTransitionHelper mTransitionHelper; - private Handler mHandler; + private final Handler mHandler = new Handler(); private OnScrollListener mScrollListener; public RecentsTvView(Context context) { this(context, null); @@ -81,9 +81,7 @@ public class RecentsTvView extends FrameLayout { LayoutInflater inflater = LayoutInflater.from(context); mEmptyView = inflater.inflate(R.layout.recents_tv_empty, this, false); addView(mEmptyView); - mEmptyViewFocusAnimationHolder = new RecentsRowFocusAnimationHolder(mEmptyView, null); - mHandler = new Handler(); mTransitionHelper = new RecentsTvTransitionHelper(mContext, mHandler); } @@ -91,20 +89,18 @@ public class RecentsTvView extends FrameLayout { protected void onFinishInflate() { super.onFinishInflate(); mDismissPlaceholder = findViewById(R.id.dismiss_placeholder); + mTaskStackHorizontalView = (TaskStackHorizontalGridView) findViewById(R.id.task_list); } - public void setTaskStack(TaskStack stack) { + /** + * Initialize the view. + */ + public void init(TaskStack stack) { RecentsConfiguration config = Recents.getConfiguration(); RecentsActivityLaunchState launchState = config.getLaunchState(); mStack = stack; - if (mTaskStackHorizontalView != null) { - mTaskStackHorizontalView.reset(); - mTaskStackHorizontalView.setStack(stack); - } else { - mTaskStackHorizontalView = (TaskStackHorizontalGridView) findViewById(R.id.task_list); - mTaskStackHorizontalView.setStack(stack); - } + mTaskStackHorizontalView.init(stack); if (stack.getStackTaskCount() > 0) { hideEmptyView(); @@ -112,6 +108,7 @@ public class RecentsTvView extends FrameLayout { showEmptyView(); } + // Layout with the new stack requestLayout(); } @@ -189,17 +186,6 @@ public class RecentsTvView extends FrameLayout { } /** - * Starts the focus change animation. - */ - public void startRecentsRowFocusAnimation(boolean hasFocus) { - if (mEmptyView.getVisibility() == View.VISIBLE) { - mEmptyViewFocusAnimationHolder.getFocusChangeAnimator(hasFocus).start(); - } else { - mTaskStackHorizontalView.startRecentsRowFocusAnimation(hasFocus); - } - } - - /** * Hides the task stack and shows the empty view. */ public void showEmptyView() { diff --git a/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskCardView.java b/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskCardView.java index 758f93a5f5d5..72a589fe3c1a 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskCardView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskCardView.java @@ -40,16 +40,18 @@ import android.widget.TextView; import com.android.systemui.R; import com.android.systemui.recents.Recents; import com.android.systemui.recents.misc.SystemServicesProxy; +import com.android.systemui.recents.model.Task; +import com.android.systemui.recents.tv.RecentsTvActivity; import com.android.systemui.recents.tv.animations.DismissAnimationsHolder; import com.android.systemui.recents.tv.animations.RecentsRowFocusAnimationHolder; import com.android.systemui.recents.tv.animations.ViewFocusAnimator; -import com.android.systemui.recents.model.Task; public class TaskCardView extends LinearLayout { private static final String TAG = "TaskCardView"; private View mThumbnailView; private View mDismissIconView; + private View mInfoFieldView; private TextView mTitleTextView; private ImageView mBadgeView; private Task mTask; @@ -79,14 +81,14 @@ public class TaskCardView extends LinearLayout { protected void onFinishInflate() { super.onFinishInflate(); mThumbnailView = findViewById(R.id.card_view_thumbnail); + mInfoFieldView = findViewById(R.id.card_info_field); mTitleTextView = (TextView) findViewById(R.id.card_title_text); mBadgeView = (ImageView) findViewById(R.id.card_extra_badge); mDismissIconView = findViewById(R.id.dismiss_icon); mDismissAnimationsHolder = new DismissAnimationsHolder(this); - View title = findViewById(R.id.card_info_field); mCornerRadius = getResources().getDimensionPixelSize( R.dimen.recents_task_view_rounded_corners_radius); - mRecentsRowFocusAnimationHolder = new RecentsRowFocusAnimationHolder(this, title); + mRecentsRowFocusAnimationHolder = new RecentsRowFocusAnimationHolder(this, mInfoFieldView); SystemServicesProxy ssp = Recents.getSystemServices(); if (!ssp.isTouchExplorationEnabled()) { mDismissIconView.setVisibility(VISIBLE); @@ -102,6 +104,9 @@ public class TaskCardView extends LinearLayout { mBadgeView.setImageDrawable(task.icon); setThumbnailView(); setContentDescription(task.titleDescription); + mDismissState = false; + mDismissAnimationsHolder.reset(); + mRecentsRowFocusAnimationHolder.reset(); } public Task getTask() { @@ -196,40 +201,37 @@ public class TaskCardView extends LinearLayout { } @Override - public boolean onKeyDown(int keyCode, KeyEvent event) { - switch (keyCode) { + public boolean dispatchKeyEvent(KeyEvent event) { + // Override dispatchKeyEvent() instead of onKeyDown() to prevent warning from ViewRootImpl. + switch (event.getKeyCode()) { case KeyEvent.KEYCODE_DPAD_DOWN : { - if (!isInDismissState()) { + if (!isInDismissState() && event.getAction() == KeyEvent.ACTION_DOWN) { setDismissState(true); return true; } break; } case KeyEvent.KEYCODE_DPAD_UP : { - if (isInDismissState()) { - setDismissState(false); - return true; + if (event.getAction() == KeyEvent.ACTION_DOWN) { + if (isInDismissState()) { + setDismissState(false); + } else { + ((RecentsTvActivity) getContext()).requestPipControlsFocus(); + } } - break; + return true; } - //Eat right and left key presses when we are in dismiss state - case KeyEvent.KEYCODE_DPAD_LEFT : { - if (isInDismissState()) { - return true; - } - break; - } + // Eat right and left key presses when we are in dismiss state + case KeyEvent.KEYCODE_DPAD_LEFT : case KeyEvent.KEYCODE_DPAD_RIGHT : { if (isInDismissState()) { return true; } break; } - default: - break; } - return super.onKeyDown(keyCode, event); + return super.dispatchKeyEvent(event); } private void setDismissState(boolean dismissState) { @@ -252,20 +254,12 @@ public class TaskCardView extends LinearLayout { mDismissAnimationsHolder.startDismissAnimation(listener); } - public RecentsRowFocusAnimationHolder getRecentsRowFocusAnimationHolder() { - return mRecentsRowFocusAnimationHolder; + public ViewFocusAnimator getViewFocusAnimator() { + return mViewFocusAnimator; } - @Override - protected void onDetachedFromWindow() { - super.onDetachedFromWindow(); - setDismissState(false); - } - - public void reset() { - mDismissState = false; - mRecentsRowFocusAnimationHolder.reset(); - mDismissAnimationsHolder.reset(); + public RecentsRowFocusAnimationHolder getRecentsRowFocusAnimationHolder() { + return mRecentsRowFocusAnimationHolder; } private void setThumbnailView() { @@ -332,6 +326,10 @@ public class TaskCardView extends LinearLayout { return mThumbnailView; } + public View getInfoFieldView() { + return mInfoFieldView; + } + public View getDismissIconView() { return mDismissIconView; } diff --git a/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskStackHorizontalGridView.java b/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskStackHorizontalGridView.java index 9f52abdad287..f9b8700c1d46 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskStackHorizontalGridView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskStackHorizontalGridView.java @@ -18,8 +18,6 @@ package com.android.systemui.recents.tv.views; import android.animation.Animator; import android.animation.AnimatorSet; import android.content.Context; -import android.os.Handler; -import android.os.Message; import android.support.v17.leanback.widget.HorizontalGridView; import android.util.AttributeSet; import android.view.View; @@ -39,14 +37,6 @@ import com.android.systemui.recents.views.AnimationProps; public class TaskStackHorizontalGridView extends HorizontalGridView implements TaskStackCallbacks { private static final int ANIMATION_DELAY_MS = 50; private static final int MSG_START_RECENT_ROW_FOCUS_ANIMATION = 100; - private final Handler mHandler = new Handler() { - @Override - public void handleMessage(Message msg) { - if (msg.what == MSG_START_RECENT_ROW_FOCUS_ANIMATION) { - startRecentsRowFocusAnimation(msg.arg1 == 1); - } - } - }; private TaskStack mStack; private Task mFocusedTask; private AnimatorSet mRecentsRowFocusAnimation; @@ -74,38 +64,15 @@ public class TaskStackHorizontalGridView extends HorizontalGridView implements T } /** - * Resets this view for reuse. - */ - public void reset() { - for (int i = 0; i < getChildCount(); i++) { - ((TaskCardView) getChildAt(i)).getRecentsRowFocusAnimationHolder().reset(); - } - if (mRecentsRowFocusAnimation != null && mRecentsRowFocusAnimation.isStarted()) { - mRecentsRowFocusAnimation.cancel(); - } - mHandler.removeCallbacksAndMessages(null); - requestLayout(); - } - - /** - * @param task - Task to reset - */ - private void resetFocusedTask(Task task) { - mFocusedTask = null; - } - - /** - * Sets the task stack. + * Initializes the grid view. * @param stack */ - public void setStack(TaskStack stack) { - //Set new stack + public void init(TaskStack stack) { + // Set new stack mStack = stack; if (mStack != null) { mStack.setCallbacks(this); } - //Layout with new stack - requestLayout(); } /** @@ -126,13 +93,6 @@ public class TaskStackHorizontalGridView extends HorizontalGridView implements T } /** - * @return - The focused task card view. - */ - public TaskCardView getFocusedTaskCardView() { - return ((TaskCardView)findFocus()); - } - - /** * @param task * @return Child view for given task */ @@ -146,32 +106,31 @@ public class TaskStackHorizontalGridView extends HorizontalGridView implements T return null; } + /** - * Starts the focus change animation. + * Starts the Recents row's focus gain animation. */ - public void startRecentsRowFocusAnimation(final boolean hasFocus) { - if (getChildCount() == 0) { - // Animation request may happen before view is attached. - // Post again with small dealy so animation can be run again later. - if (getAdapter().getItemCount() > 0) { - mHandler.sendMessageDelayed(mHandler.obtainMessage( - MSG_START_RECENT_ROW_FOCUS_ANIMATION, hasFocus ? 1 : 0), - ANIMATION_DELAY_MS); + public void startFocusGainAnimation() { + for (int i = 0; i < getChildCount(); i++) { + TaskCardView v = (TaskCardView) getChildAt(i); + if (v.hasFocus()) { + v.getViewFocusAnimator().changeSize(true); } - return; - } - if (mRecentsRowFocusAnimation != null && mRecentsRowFocusAnimation.isStarted()) { - mRecentsRowFocusAnimation.cancel(); + v.getRecentsRowFocusAnimationHolder().startFocusGainAnimation(); } - Animator animator = ((TaskCardView) getChildAt(0)).getRecentsRowFocusAnimationHolder() - .getFocusChangeAnimator(hasFocus); - mRecentsRowFocusAnimation = new AnimatorSet(); - AnimatorSet.Builder builder = mRecentsRowFocusAnimation.play(animator); - for (int i = 1; i < getChildCount(); i++) { - builder.with(((TaskCardView) getChildAt(i)).getRecentsRowFocusAnimationHolder() - .getFocusChangeAnimator(hasFocus)); + } + + /** + * Starts the Recents row's focus loss animation. + */ + public void startFocusLossAnimation() { + for (int i = 0; i < getChildCount(); i++) { + TaskCardView v = (TaskCardView) getChildAt(i); + if (v.hasFocus()) { + v.getViewFocusAnimator().changeSize(false); + } + v.getRecentsRowFocusAnimationHolder().startFocusLossAnimation(); } - mRecentsRowFocusAnimation.start(); } @Override @@ -181,11 +140,11 @@ public class TaskStackHorizontalGridView extends HorizontalGridView implements T } @Override - public void onStackTaskRemoved(TaskStack stack, Task removedTask, boolean wasFrontMostTask, - Task newFrontMostTask, AnimationProps animation, boolean fromDockGesture) { + public void onStackTaskRemoved(TaskStack stack, Task removedTask, Task newFrontMostTask, + AnimationProps animation, boolean fromDockGesture) { ((TaskStackHorizontalViewAdapter) getAdapter()).removeTask(removedTask); if (mFocusedTask == removedTask) { - resetFocusedTask(removedTask); + mFocusedTask = null; } // If there are no remaining tasks, then just close recents if (mStack.getStackTaskCount() == 0) { diff --git a/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskStackHorizontalViewAdapter.java b/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskStackHorizontalViewAdapter.java index b6b86b409948..236d0778fadd 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskStackHorizontalViewAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskStackHorizontalViewAdapter.java @@ -43,17 +43,13 @@ public class TaskStackHorizontalViewAdapter extends private static final String TAG = "TaskStackViewAdapter"; private List<Task> mTaskList; private TaskStackHorizontalGridView mGridView; - private boolean mResetAddedCards; public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener{ private TaskCardView mTaskCardView; private Task mTask; - private boolean mShouldReset; public ViewHolder(View v) { super(v); - if(v instanceof TaskCardView) { - mTaskCardView = (TaskCardView) v; - } + mTaskCardView = (TaskCardView) v; } public void init(Task task) { @@ -90,7 +86,6 @@ public class TaskStackHorizontalViewAdapter extends public void onAnimationEnd(Animator animation) { removeTask(task); EventBus.getDefault().send(new DeleteTaskDataEvent(task)); - mShouldReset = true; } @Override @@ -131,23 +126,6 @@ public class TaskStackHorizontalViewAdapter extends } @Override - public void onViewAttachedToWindow(ViewHolder holder) { - if (mResetAddedCards) { - holder.mTaskCardView.reset(); - } - } - - @Override - public void onViewDetachedFromWindow(ViewHolder holder) { - // We only want to reset on view detach if this is the last task being dismissed. - // This is so that we do not reset when shifting to apps etc, as it is not needed. - if (holder.mShouldReset) { - holder.mTaskCardView.reset(); - holder.mShouldReset = false; - } - } - - @Override public int getItemCount() { return mTaskList.size(); } @@ -178,8 +156,4 @@ public class TaskStackHorizontalViewAdapter extends mTaskList.add(position, task); notifyItemInserted(position); } - - public void setResetAddedCards(boolean reset) { - mResetAddedCards = reset; - } } diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackAnimationHelper.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackAnimationHelper.java index f4c13d7b8cdc..493e6187c83e 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackAnimationHelper.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackAnimationHelper.java @@ -148,10 +148,12 @@ public class TaskStackAnimationHelper { for (int i = taskViews.size() - 1; i >= 0; i--) { TaskView tv = taskViews.get(i); Task task = tv.getTask(); - boolean currentTaskOccludesLaunchTarget = (launchTargetTask != null && - launchTargetTask.group.isTaskAboveTask(task, launchTargetTask)); - boolean hideTask = (launchTargetTask != null && - launchTargetTask.isFreeformTask() && task.isFreeformTask()); + boolean currentTaskOccludesLaunchTarget = launchTargetTask != null && + launchTargetTask.group != null && + launchTargetTask.group.isTaskAboveTask(task, launchTargetTask); + boolean hideTask = launchTargetTask != null && + launchTargetTask.isFreeformTask() && + task.isFreeformTask(); // Get the current transform for the task, which will be used to position it offscreen stackLayout.getStackTransform(task, stackScroller.getStackScroll(), mTmpTransform, @@ -221,11 +223,9 @@ public class TaskStackAnimationHelper { int taskIndexFromBack = i; final TaskView tv = taskViews.get(i); Task task = tv.getTask(); - boolean currentTaskOccludesLaunchTarget = false; - if (launchTargetTask != null) { - currentTaskOccludesLaunchTarget = launchTargetTask.group.isTaskAboveTask(task, - launchTargetTask); - } + boolean currentTaskOccludesLaunchTarget = launchTargetTask != null && + launchTargetTask.group != null && + launchTargetTask.group.isTaskAboveTask(task, launchTargetTask); // Get the current transform for the task, which will be updated to the final transform // to animate to depending on how recents was invoked @@ -358,8 +358,9 @@ public class TaskStackAnimationHelper { for (int i = 0; i < taskViewCount; i++) { TaskView tv = taskViews.get(i); Task task = tv.getTask(); - boolean currentTaskOccludesLaunchTarget = (launchingTask != null && - launchingTask.group.isTaskAboveTask(task, launchingTask)); + boolean currentTaskOccludesLaunchTarget = launchingTask != null && + launchingTask.group != null && + launchingTask.group.isTaskAboveTask(task, launchingTask); if (tv == launchingTaskView) { tv.setClipViewInStack(false); diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java index 77b733881a0f..e3fe1abf8b20 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java @@ -404,7 +404,7 @@ public class TaskStackLayoutAlgorithm { * Sets the system insets. */ public boolean setSystemInsets(Rect systemInsets) { - boolean changed = mSystemInsets.equals(systemInsets); + boolean changed = !mSystemInsets.equals(systemInsets); mSystemInsets.set(systemInsets); return changed; } @@ -583,11 +583,25 @@ public class TaskStackLayoutAlgorithm { if (getInitialFocusState() == STATE_UNFOCUSED && mNumStackTasks > 1) { if (ignoreScrollToFront || (!launchState.launchedWithAltTab && !scrollToFront)) { // Set the initial scroll to the predefined state (which differs from the stack) - float [] initialNormX = new float[] { - getNormalizedXFromUnfocusedY(mSystemInsets.bottom + mInitialBottomOffset, - FROM_BOTTOM), - getNormalizedXFromUnfocusedY(mInitialTopOffset, FROM_TOP) - }; + float [] initialNormX = null; + float minBottomTaskNormX = getNormalizedXFromUnfocusedY(mSystemInsets.bottom + + mInitialBottomOffset, FROM_BOTTOM); + float maxBottomTaskNormX = getNormalizedXFromUnfocusedY(mFocusedTopPeekHeight + + mTaskRect.height() - mMinMargin, FROM_TOP); + if (mNumStackTasks <= 2) { + // For small stacks, position the tasks so that they are top aligned to under + // the action button, but ensure that it is at least a certain offset from the + // bottom of the stack + initialNormX = new float[] { + Math.min(maxBottomTaskNormX, minBottomTaskNormX), + getNormalizedXFromUnfocusedY(mFocusedTopPeekHeight, FROM_TOP) + }; + } else { + initialNormX = new float[] { + minBottomTaskNormX, + getNormalizedXFromUnfocusedY(mInitialTopOffset, FROM_TOP) + }; + } mUnfocusedRange.offset(0f); List<Task> tasks = stack.getStackTasks(); @@ -881,14 +895,7 @@ public class TaskStackLayoutAlgorithm { TaskViewTransform frontTransform, boolean ignoreSingleTaskCase, boolean forceUpdate) { SystemServicesProxy ssp = Recents.getSystemServices(); - // Compute the focused and unfocused offset - float boundedStackScroll = Utilities.clamp(stackScroll, mMinScrollP, mMaxScrollP); - mUnfocusedRange.offset(boundedStackScroll); - mFocusedRange.offset(boundedStackScroll); - float boundedScrollUnfocusedRangeX = mUnfocusedRange.getNormalizedX(taskProgress); - float boundedScrollFocusedRangeX = mFocusedRange.getNormalizedX(taskProgress); - float boundedScrollUnfocusedNonOverrideRangeX = - mUnfocusedRange.getNormalizedX(nonOverrideTaskProgress); + // Ensure that the task is in range mUnfocusedRange.offset(stackScroll); mFocusedRange.offset(stackScroll); boolean unfocusedVisible = mUnfocusedRange.isInRange(taskProgress); @@ -900,9 +907,30 @@ public class TaskStackLayoutAlgorithm { return; } + // Map the absolute task progress to the normalized x at the stack scroll. We use this to + // calculate positions along the curve. + mUnfocusedRange.offset(stackScroll); + mFocusedRange.offset(stackScroll); float unfocusedRangeX = mUnfocusedRange.getNormalizedX(taskProgress); float focusedRangeX = mFocusedRange.getNormalizedX(taskProgress); + // Map the absolute task progress to the normalized x at the bounded stack scroll. We use + // this to calculate bounded properties, like translationZ and outline alpha. + float boundedStackScroll = Utilities.clamp(stackScroll, mMinScrollP, mMaxScrollP); + mUnfocusedRange.offset(boundedStackScroll); + mFocusedRange.offset(boundedStackScroll); + float boundedScrollUnfocusedRangeX = mUnfocusedRange.getNormalizedX(taskProgress); + float boundedScrollUnfocusedNonOverrideRangeX = + mUnfocusedRange.getNormalizedX(nonOverrideTaskProgress); + + // Map the absolute task progress to the normalized x at the upper bounded stack scroll. + // We use this to calculate the dim, which is bounded only on one end. + float lowerBoundedStackScroll = Utilities.clamp(stackScroll, -Float.MAX_VALUE, mMaxScrollP); + mUnfocusedRange.offset(lowerBoundedStackScroll); + mFocusedRange.offset(lowerBoundedStackScroll); + float lowerBoundedUnfocusedRangeX = mUnfocusedRange.getNormalizedX(taskProgress); + float lowerBoundedFocusedRangeX = mFocusedRange.getNormalizedX(taskProgress); + int x = (mStackRect.width() - mTaskRect.width()) / 2; int y; float z; @@ -917,7 +945,8 @@ public class TaskStackLayoutAlgorithm { y = centerYOffset + getYForDeltaP(tmpP, 0); z = mMaxTranslationZ; dimAlpha = 0f; - viewOutlineAlpha = (OUTLINE_ALPHA_MIN_VALUE + OUTLINE_ALPHA_MAX_VALUE) / 2f; + viewOutlineAlpha = OUTLINE_ALPHA_MIN_VALUE + + (OUTLINE_ALPHA_MAX_VALUE - OUTLINE_ALPHA_MIN_VALUE) / 2f; } else { // Otherwise, update the task to the stack layout @@ -926,9 +955,22 @@ public class TaskStackLayoutAlgorithm { int focusedY = (int) ((1f - mFocusedCurveInterpolator.getInterpolation( focusedRangeX)) * mStackRect.height()); float unfocusedDim = mUnfocusedDimCurveInterpolator.getInterpolation( - boundedScrollUnfocusedRangeX); + lowerBoundedUnfocusedRangeX); float focusedDim = mFocusedDimCurveInterpolator.getInterpolation( - boundedScrollFocusedRangeX); + lowerBoundedFocusedRangeX); + + // Special case, because we override the initial task positions differently for small + // stacks, we clamp the dim to 0 in the initial position, and then only modulate the + // dim when the task is scrolled back towards the top of the screen + if (mNumStackTasks <= 2 && nonOverrideTaskProgress == 0f) { + if (boundedScrollUnfocusedRangeX >= 0.5f) { + unfocusedDim = 0f; + } else { + float offset = mUnfocusedDimCurveInterpolator.getInterpolation(0.5f); + unfocusedDim -= offset; + unfocusedDim *= MAX_DIM / (MAX_DIM - offset); + } + } y = (mStackRect.top - mTaskRect.top) + (int) Utilities.mapRange(focusState, unfocusedY, focusedY); diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java index 1a197b69c1bb..231360e46ae9 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java @@ -1400,8 +1400,8 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal * We expect that the {@link TaskView} associated with the removed task is already hidden. */ @Override - public void onStackTaskRemoved(TaskStack stack, Task removedTask, boolean wasFrontMostTask, - Task newFrontMostTask, AnimationProps animation, boolean fromDockGesture) { + public void onStackTaskRemoved(TaskStack stack, Task removedTask, Task newFrontMostTask, + AnimationProps animation, boolean fromDockGesture) { if (mFocusedTask == removedTask) { resetFocusedTask(removedTask); } @@ -1996,6 +1996,10 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal if (event.fromDeviceOrientationChange) { mDisplayOrientation = Utilities.getAppConfiguration(mContext).orientation; mDisplayRect = Recents.getSystemServices().getDisplayRect(); + + // Always stop the scroller, otherwise, we may continue setting the stack scroll to the + // wrong bounds in the new layout + mStackScroller.stopScroller(); } reloadOnConfigurationChange(); diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java b/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java index e89c136d8772..a0bae202a7bb 100644 --- a/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java @@ -39,6 +39,7 @@ import java.io.PrintWriter; public class Divider extends SystemUI { private DividerWindowManager mWindowManager; private DividerView mView; + private final DividerState mDividerState = new DividerState(); private DockDividerVisibilityListener mDockDividerVisibilityListener; private boolean mVisible = false; private boolean mMinimized = false; @@ -76,7 +77,7 @@ public class Divider extends SystemUI { final int width = landscape ? size : MATCH_PARENT; final int height = landscape ? MATCH_PARENT : size; mWindowManager.add(mView, width, height); - mView.setWindowManager(mWindowManager); + mView.injectDependencies(mWindowManager, mDividerState); } private void removeDivider() { diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerState.java b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerState.java new file mode 100644 index 000000000000..353a9749eb25 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerState.java @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.systemui.stackdivider; + +/** + * Class to hold state of divider that needs to persist across configuration changes. + */ +public class DividerState { + public boolean animateAfterRecentsDrawn; + public boolean growAfterRecentsDrawn; +} diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java index f728aa438aa5..998f50f205d7 100644 --- a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java @@ -30,12 +30,12 @@ import android.graphics.Rect; import android.graphics.Region.Op; import android.hardware.display.DisplayManager; import android.os.Bundle; +import android.os.Handler; import android.util.AttributeSet; import android.view.Display; import android.view.DisplayInfo; import android.view.GestureDetector; import android.view.GestureDetector.SimpleOnGestureListener; -import android.view.HapticFeedbackConstants; import android.view.MotionEvent; import android.view.PointerIcon; import android.view.VelocityTracker; @@ -141,8 +141,6 @@ public class DividerView extends FrameLayout implements OnTouchListener, private DividerSnapAlgorithm mSnapAlgorithm; private final Rect mStableInsets = new Rect(); - private boolean mAnimateAfterRecentsDrawn; - private boolean mGrowAfterRecentsDrawn; private boolean mGrowRecents; private ValueAnimator mCurrentAnimator; private boolean mEntranceAnimationRunning; @@ -151,6 +149,8 @@ public class DividerView extends FrameLayout implements OnTouchListener, private GestureDetector mGestureDetector; private boolean mDockedStackMinimized; private boolean mAdjustedForIme; + private DividerState mState; + private final Handler mHandler = new Handler(); private final AccessibilityDelegate mHandleDelegate = new AccessibilityDelegate() { @Override @@ -335,8 +335,9 @@ public class DividerView extends FrameLayout implements OnTouchListener, } } - public void setWindowManager(DividerWindowManager windowManager) { + public void injectDependencies(DividerWindowManager windowManager, DividerState dividerState) { mWindowManager = windowManager; + mState = dividerState; } public WindowManagerProxy getWindowManagerProxy() { @@ -558,7 +559,7 @@ public class DividerView extends FrameLayout implements OnTouchListener, if (endDelay == 0 || mCancelled) { endAction.run(); } else { - postDelayed(endAction, endDelay); + mHandler.postDelayed(endAction, endDelay); } } }); @@ -1048,31 +1049,39 @@ public class DividerView extends FrameLayout implements OnTouchListener, public final void onBusEvent(RecentsActivityStartingEvent recentsActivityStartingEvent) { if (mGrowRecents && getWindowManagerProxy().getDockSide() == WindowManager.DOCKED_TOP && getCurrentPosition() == getSnapAlgorithm().getLastSplitTarget().position) { - mGrowAfterRecentsDrawn = true; + mState.growAfterRecentsDrawn = true; startDragging(false /* animate */, false /* touching */); } } public final void onBusEvent(DockedTopTaskEvent event) { if (event.dragMode == NavigationBarGestureHelper.DRAG_MODE_NONE) { - mGrowAfterRecentsDrawn = false; - mAnimateAfterRecentsDrawn = true; + mState.growAfterRecentsDrawn = false; + mState.animateAfterRecentsDrawn = true; startDragging(false /* animate */, false /* touching */); } updateDockSide(); int position = DockedDividerUtils.calculatePositionForBounds(event.initialRect, mDockSide, mDividerSize); mEntranceAnimationRunning = true; + + // Insets might not have been fetched yet, so fetch manually if needed. + if (mStableInsets.isEmpty()) { + SystemServicesProxy.getInstance(mContext).getStableInsets(mStableInsets); + mSnapAlgorithm = null; + initializeSnapAlgorithm(); + } + resizeStack(position, mSnapAlgorithm.getMiddleTarget().position, mSnapAlgorithm.getMiddleTarget()); } public final void onBusEvent(RecentsDrawnEvent drawnEvent) { - if (mAnimateAfterRecentsDrawn) { - mAnimateAfterRecentsDrawn = false; + if (mState.animateAfterRecentsDrawn) { + mState.animateAfterRecentsDrawn = false; updateDockSide(); - post(() -> { + mHandler.post(() -> { // Delay switching resizing mode because this might cause jank in recents animation // that's longer than this animation. stopDragging(getCurrentPosition(), mSnapAlgorithm.getMiddleTarget(), @@ -1080,8 +1089,8 @@ public class DividerView extends FrameLayout implements OnTouchListener, 200 /* endDelay */); }); } - if (mGrowAfterRecentsDrawn) { - mGrowAfterRecentsDrawn = false; + if (mState.growAfterRecentsDrawn) { + mState.growAfterRecentsDrawn = false; updateDockSide(); EventBus.getDefault().send(new RecentsGrowingEvent()); stopDragging(getCurrentPosition(), mSnapAlgorithm.getMiddleTarget(), 336, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java b/packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java index 71f74cdcbdeb..42c9a126ca14 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java @@ -98,6 +98,7 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView private boolean mDark; private int mBgTint = 0; + private float mBgAlpha = 1f; /** * Flag to indicate that the notification has been touched once and the second touch will @@ -392,6 +393,7 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView public void setDimmed(boolean dimmed, boolean fade) { if (mDimmed != dimmed) { mDimmed = dimmed; + resetBackgroundAlpha(); if (fade) { fadeDimmedBackground(); } else { @@ -594,14 +596,28 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView mBackgroundAnimator.start(); } + protected void updateBackgroundAlpha(float transformationAmount) { + mBgAlpha = isChildInGroup() && mDimmed ? transformationAmount : 1f; + mBackgroundDimmed.setAlpha(mBgAlpha); + } + + protected void resetBackgroundAlpha() { + updateBackgroundAlpha(0f /* transformationAmount */); + } + protected void updateBackground() { cancelFadeAnimations(); if (shouldHideBackground()) { mBackgroundDimmed.setVisibility(View.INVISIBLE); mBackgroundNormal.setVisibility(View.INVISIBLE); } else if (mDimmed) { - mBackgroundDimmed.setVisibility(View.VISIBLE); - mBackgroundNormal.setVisibility(mActivated ? View.VISIBLE : View.INVISIBLE); + // When groups are animating to the expanded state from the lockscreen, show the + // normal background instead of the dimmed background + final boolean dontShowDimmed = isGroupExpansionChanging() && isChildInGroup(); + mBackgroundDimmed.setVisibility(dontShowDimmed ? View.INVISIBLE : View.VISIBLE); + mBackgroundNormal.setVisibility((mActivated || dontShowDimmed) + ? View.VISIBLE + : View.INVISIBLE); } else { mBackgroundDimmed.setVisibility(View.INVISIBLE); mBackgroundNormal.setVisibility(View.VISIBLE); @@ -876,6 +892,7 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView public void reset() { setTintColor(0); + resetBackgroundAlpha(); setShowingLegacyBackground(false); setBelowSpeedBump(false); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java index 63933d412400..91889d3b91ad 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java @@ -1887,10 +1887,13 @@ public abstract class BaseStatusBar extends SystemUI implements public boolean onDismiss() { if (mHeadsUpManager != null && mHeadsUpManager.isHeadsUp(notificationKey)) { // Release the HUN notification to the shade. + + if (isPanelFullyCollapsed()) { + HeadsUpManager.setIsClickedNotification(row, true); + } // // In most cases, when FLAG_AUTO_CANCEL is set, the notification will // become canceled shortly by NoMan, but we can't assume that. - HeadsUpManager.setIsClickedNotification(row, true); mHeadsUpManager.releaseImmediately(notificationKey); } StatusBarNotification parentToCancel = null; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java index c53ab5902dec..aedc7df0ebc3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java @@ -18,10 +18,9 @@ package com.android.systemui.statusbar; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; -import android.animation.AnimatorSet; import android.animation.ObjectAnimator; -import android.animation.ValueAnimator; import android.animation.ValueAnimator.AnimatorUpdateListener; +import android.annotation.Nullable; import android.content.Context; import android.graphics.drawable.AnimatedVectorDrawable; import android.graphics.drawable.AnimationDrawable; @@ -41,6 +40,9 @@ import android.view.accessibility.AccessibilityEvent; import android.widget.Chronometer; import android.widget.ImageView; +import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.MetricsProto; +import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.util.NotificationColorUtil; import com.android.systemui.R; import com.android.systemui.classifier.FalsingManager; @@ -138,11 +140,14 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { @Override public void onClick(View v) { if (!mShowingPublic && mGroupManager.isSummaryOfGroup(mStatusBarNotification)) { - mGroupManager.toggleGroupExpansion(mStatusBarNotification); - mOnExpandClickListener.onExpandClicked(mEntry, - mGroupManager.isGroupExpanded(mStatusBarNotification)); + final boolean wasExpanded = mGroupManager.isGroupExpanded(mStatusBarNotification); + boolean nowExpanded = mGroupManager.toggleGroupExpansion(mStatusBarNotification); + mOnExpandClickListener.onExpandClicked(mEntry, nowExpanded); mGroupExpansionChanging = true; updateBackgroundForGroupState(); + MetricsLogger.action(mContext, MetricsEvent.ACTION_NOTIFICATION_GROUP_EXPANDER, + nowExpanded); + logExpansionEvent(true /* userAction */, wasExpanded); } else { boolean nowExpanded; if (isPinned()) { @@ -154,6 +159,8 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { } notifyHeightChanged(true); mOnExpandClickListener.onExpandClicked(mEntry, nowExpanded); + MetricsLogger.action(mContext, MetricsEvent.ACTION_NOTIFICATION_EXPANDER, + nowExpanded); } } }; @@ -173,6 +180,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { return object.getTranslation(); } }; + private OnClickListener mOnClickListener; public boolean isGroupExpansionChanging() { if (isChildInGroup()) { @@ -373,7 +381,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { boolean childInGroup = BaseStatusBar.ENABLE_CHILD_NOTIFICATIONS && isChildInGroup; mNotificationParent = childInGroup ? parent : null; mPrivateLayout.setIsChildInGroup(childInGroup); + resetBackgroundAlpha(); updateBackgroundForGroupState(); + updateClickAndFocus(); if (mNotificationParent != null) { mNotificationParent.updateBackgroundForGroupState(); } @@ -585,6 +595,24 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { mOnExpandClickListener = onExpandClickListener; } + @Override + public void setOnClickListener(@Nullable OnClickListener l) { + super.setOnClickListener(l); + mOnClickListener = l; + updateClickAndFocus(); + } + + private void updateClickAndFocus() { + boolean normalChild = !isChildInGroup() || isGroupExpanded(); + boolean clickable = mOnClickListener != null && normalChild; + if (isFocusable() != normalChild) { + setFocusable(normalChild); + } + if (isClickable() != clickable) { + setClickable(clickable); + } + } + public void setHeadsUpManager(HeadsUpManager headsUpManager) { mHeadsUpManager = headsUpManager; } @@ -1019,7 +1047,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { public void setUserExpanded(boolean userExpanded, boolean allowChildExpansion) { mFalsingManager.setNotificationExpanded(); if (mIsSummaryWithChildren && !mShowingPublic && allowChildExpansion) { + final boolean wasExpanded = mGroupManager.isGroupExpanded(mStatusBarNotification); mGroupManager.setGroupExpanded(mStatusBarNotification, userExpanded); + logExpansionEvent(true /* userAction */, wasExpanded); return; } if (userExpanded && !mExpandable) return; @@ -1043,7 +1073,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { mPrivateLayout.setUserExpanding(userLocked); if (mIsSummaryWithChildren) { mChildrenContainer.setUserLocked(userLocked); - if (userLocked) { + if (userLocked || (!userLocked && !isGroupExpanded())) { updateBackgroundForGroupState(); } } @@ -1067,7 +1097,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { mIsSystemExpanded = expand; notifyHeightChanged(false /* needsAnimation */); logExpansionEvent(false, wasExpanded); - if (mChildrenContainer != null) { + if (mIsSummaryWithChildren) { mChildrenContainer.updateGroupOverflow(); } } @@ -1136,13 +1166,14 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { mChildrenContainer.recreateNotificationHeader(mExpandClickListener, mEntry.notification); } + getShowingLayout().updateBackgroundColor(false /* animate */); mPrivateLayout.updateExpandButtons(isExpandable()); updateChildrenHeaderAppearance(); updateChildrenVisibility(); } public void updateChildrenHeaderAppearance() { - if (mChildrenContainer != null) { + if (mIsSummaryWithChildren) { mChildrenContainer.updateChildrenHeaderAppearance(); } } @@ -1305,6 +1336,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { if (mChildrenContainer != null) { mChildrenContainer.setChildrenExpanded(expanded); } + updateClickAndFocus(); } public static void applyTint(View v, int color) { @@ -1476,11 +1508,26 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { updateBackground(); } + public int getPositionOfChild(ExpandableNotificationRow childRow) { + if (mIsSummaryWithChildren) { + return mChildrenContainer.getPositionInLinearLayout(childRow); + } + return 0; + } + public void setExpansionLogger(ExpansionLogger logger, String key) { mLogger = logger; mLoggingKey = key; } + public void onExpandedByGesture(boolean userExpanded) { + int event = MetricsEvent.ACTION_NOTIFICATION_GESTURE_EXPANDER; + if (mGroupManager.isSummaryOfGroup(getStatusBarNotification())) { + event = MetricsEvent.ACTION_NOTIFICATION_GROUP_GESTURE_EXPANDER; + } + MetricsLogger.action(mContext, event, userExpanded); + } + @Override public float getIncreasedPaddingAmount() { if (mIsSummaryWithChildren) { @@ -1505,7 +1552,10 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { } private void logExpansionEvent(boolean userAction, boolean wasExpanded) { - final boolean nowExpanded = isExpanded(); + boolean nowExpanded = isExpanded(); + if (mIsSummaryWithChildren) { + nowExpanded = mGroupManager.isGroupExpanded(mStatusBarNotification); + } if (wasExpanded != nowExpanded && mLogger != null) { mLogger.logNotificationExpansion(mLoggingKey, userAction, nowExpanded) ; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java index f3c666f90e40..21fed3c47689 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java @@ -277,15 +277,25 @@ public class NotificationContentView extends FrameLayout { mContractedChild.animate().cancel(); removeView(mContractedChild); } - mPreviousExpandedRemoteInputIntent = - mExpandedRemoteInput != null ? mExpandedRemoteInput.getPendingIntent() : null; + mPreviousExpandedRemoteInputIntent = null; + if (mExpandedRemoteInput != null) { + mExpandedRemoteInput.onNotificationUpdateOrReset(); + if (mExpandedRemoteInput.isActive()) { + mPreviousExpandedRemoteInputIntent = mExpandedRemoteInput.getPendingIntent(); + } + } if (mExpandedChild != null) { mExpandedChild.animate().cancel(); removeView(mExpandedChild); mExpandedRemoteInput = null; } - mPreviousHeadsUpRemoteInputIntent = - mHeadsUpRemoteInput != null ? mHeadsUpRemoteInput.getPendingIntent() : null; + mPreviousHeadsUpRemoteInputIntent = null; + if (mHeadsUpRemoteInput != null) { + mHeadsUpRemoteInput.onNotificationUpdateOrReset(); + if (mHeadsUpRemoteInput.isActive()) { + mPreviousHeadsUpRemoteInputIntent = mHeadsUpRemoteInput.getPendingIntent(); + } + } if (mHeadsUpChild != null) { mHeadsUpChild.animate().cancel(); removeView(mHeadsUpChild); @@ -360,7 +370,9 @@ public class NotificationContentView extends FrameLayout { private void setVisible(final boolean isVisible) { if (isVisible) { - + // This call can happen multiple times, but removing only removes a single one. + // We therefore need to remove the old one. + getViewTreeObserver().removeOnPreDrawListener(mEnableAnimationPredrawListener); // We only animate if we are drawn at least once, otherwise the view might animate when // it's shown the first time getViewTreeObserver().addOnPreDrawListener(mEnableAnimationPredrawListener); @@ -401,12 +413,17 @@ public class NotificationContentView extends FrameLayout { return mContext.getResources().getDimensionPixelSize( com.android.internal.R.dimen.notification_action_list_height); } + int hint; if (mHeadsUpChild != null) { - return mHeadsUpChild.getHeight(); + hint = mHeadsUpChild.getHeight(); } else { - return mContractedChild.getHeight() + mContext.getResources().getDimensionPixelSize( - com.android.internal.R.dimen.notification_action_list_height); + hint = mContractedChild.getHeight() + mContext.getResources().getDimensionPixelSize( + com.android.internal.R.dimen.notification_action_list_height); + } + if (mExpandedChild != null) { + hint = Math.min(hint, mExpandedChild.getHeight()); } + return hint; } private void updateContentTransformation() { @@ -455,6 +472,7 @@ public class NotificationContentView extends FrameLayout { endColor = NotificationUtils.interpolateColors(startColor, endColor, transformationAmount); } + mContainingNotification.updateBackgroundAlpha(transformationAmount); mContainingNotification.setContentBackground(endColor, false, this); } @@ -587,6 +605,7 @@ public class NotificationContentView extends FrameLayout { public void updateBackgroundColor(boolean animate) { int customBackgroundColor = getBackgroundColor(mVisibleType); + mContainingNotification.resetBackgroundAlpha(); mContainingNotification.setContentBackground(customBackgroundColor, animate, this); } @@ -901,7 +920,7 @@ public class NotificationContentView extends FrameLayout { view.findViewWithTag(RemoteInputView.VIEW_TAG); if (existing != null) { - existing.onNotificationUpdate(); + existing.onNotificationUpdateOrReset(); } if (existing == null && hasRemoteInput) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java index 4650a1f090ed..5bbca1552a14 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java @@ -23,6 +23,7 @@ import android.content.Context; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.res.ColorStateList; +import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.drawable.Drawable; import android.os.Handler; @@ -70,6 +71,8 @@ public class NotificationGuts extends LinearLayout implements TunerService.Tunab private ImageView mAutoButton; private ColorStateList mActiveSliderTint; private ColorStateList mInactiveSliderTint; + private float mActiveSliderAlpha = 1.0f; + private float mInactiveSliderAlpha; private TextView mImportanceSummary; private TextView mImportanceTitle; private boolean mAuto; @@ -90,7 +93,6 @@ public class NotificationGuts extends LinearLayout implements TunerService.Tunab public NotificationGuts(Context context, AttributeSet attrs) { super(context, attrs); setWillNotDraw(false); - TunerService.get(mContext).addTunable(this, SHOW_SLIDER); mHandler = new Handler(); mFalsingCheck = new Runnable() { @Override @@ -100,6 +102,23 @@ public class NotificationGuts extends LinearLayout implements TunerService.Tunab } } }; + final TypedArray ta = + context.obtainStyledAttributes(attrs, com.android.internal.R.styleable.Theme, 0, 0); + mInactiveSliderAlpha = + ta.getFloat(com.android.internal.R.styleable.Theme_disabledAlpha, 0.5f); + ta.recycle(); + } + + @Override + protected void onAttachedToWindow() { + super.onAttachedToWindow(); + TunerService.get(mContext).addTunable(this, SHOW_SLIDER); + } + + @Override + protected void onDetachedFromWindow() { + TunerService.get(mContext).removeTunable(this); + super.onDetachedFromWindow(); } public void resetFalsingCheck() { @@ -299,13 +318,12 @@ public class NotificationGuts extends LinearLayout implements TunerService.Tunab private void applyAuto() { mSeekBar.setEnabled(!mAuto); - final ColorStateList sliderTint = mAuto ? mInactiveSliderTint : mActiveSliderTint; final ColorStateList starTint = mAuto ? mActiveSliderTint : mInactiveSliderTint; + final float alpha = mAuto ? mInactiveSliderAlpha : mActiveSliderAlpha; Drawable icon = mAutoButton.getDrawable().mutate(); icon.setTintList(starTint); mAutoButton.setImageDrawable(icon); - mSeekBar.setProgressTintList(sliderTint); - mSeekBar.setThumbTintList(sliderTint); + mSeekBar.setAlpha(alpha); if (mAuto) { mSeekBar.setProgress(mNotificationImportance); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java index bc33b305432e..cdfdad464065 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java @@ -18,6 +18,7 @@ package com.android.systemui.statusbar; import android.app.Notification; import android.content.Context; +import android.content.pm.ApplicationInfo; import android.content.res.Configuration; import android.content.res.Resources; import android.graphics.Canvas; @@ -25,6 +26,7 @@ import android.graphics.Paint; import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; +import android.os.Parcelable; import android.os.UserHandle; import android.text.TextUtils; import android.util.AttributeSet; @@ -325,8 +327,20 @@ public class StatusBarIconView extends AnimatedImageView { public static String contentDescForNotification(Context c, Notification n) { - Notification.Builder builder = Notification.Builder.recoverBuilder(c, n); - String appName = builder.loadHeaderAppName(); + String appName = ""; + try { + Notification.Builder builder = Notification.Builder.recoverBuilder(c, n); + appName = builder.loadHeaderAppName(); + } catch (RuntimeException e) { + Log.e(TAG, "Unable to recover builder", e); + // Trying to get the app name from the app info instead. + Parcelable appInfo = n.extras.getParcelable( + Notification.EXTRA_BUILDER_APPLICATION_INFO); + if (appInfo instanceof ApplicationInfo) { + appName = String.valueOf(((ApplicationInfo) appInfo).loadLabel( + c.getPackageManager())); + } + } CharSequence title = n.extras.getCharSequence(Notification.EXTRA_TITLE); CharSequence ticker = n.tickerText; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/HeaderTransformState.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/HeaderTransformState.java index b66e9f313e9a..8463e069abc1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/HeaderTransformState.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/HeaderTransformState.java @@ -109,9 +109,6 @@ public class HeaderTransformState extends TransformState { @Override public void recycle() { super.recycle(); - if (mWorkProfileState != null) { - mWorkProfileState.recycle(); - } sInstancePool.release(this); } @@ -120,6 +117,10 @@ public class HeaderTransformState extends TransformState { super.reset(); mExpandButton = null; mWorkProfileState = null; + if (mWorkProfileState != null) { + mWorkProfileState.recycle(); + mWorkProfileState = null; + } } public void setVisible(boolean visible) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/HybridGroupManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/HybridGroupManager.java index 8f2c81f0726b..737360750182 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/HybridGroupManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/HybridGroupManager.java @@ -112,6 +112,10 @@ public class HybridGroupManager { if (!text.equals(reusableView.getText())) { reusableView.setText(text); } + String contentDescription = String.format(mContext.getResources().getQuantityString( + R.plurals.notification_group_overflow_description, number), number); + + reusableView.setContentDescription(contentDescription); return reusableView; } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationCustomViewWrapper.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationCustomViewWrapper.java index 61df44acbc50..85e87ddc84df 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationCustomViewWrapper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationCustomViewWrapper.java @@ -127,7 +127,8 @@ public class NotificationCustomViewWrapper extends NotificationViewWrapper { @Override public int getCustomBackgroundColor() { - return mBackgroundColor; + // Parent notifications should always use the normal background color + return mRow.isSummaryWithChildren() ? 0 : mBackgroundColor; } @Override diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/TextViewTransformState.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/TextViewTransformState.java index 20dbc4a31b8a..6fe5756ea9f8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/TextViewTransformState.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/TextViewTransformState.java @@ -47,12 +47,16 @@ public class TextViewTransformState extends TransformState { int ownEllipsized = getEllipsisCount(); int otherEllipsized = otherTvs.getEllipsisCount(); return ownEllipsized == otherEllipsized - && mText.getHeight() == otherTvs.mText.getHeight(); + && getInnerHeight(mText) == getInnerHeight(otherTvs.mText); } } return super.sameAs(otherState); } + private int getInnerHeight(TextView text) { + return text.getHeight() - text.getPaddingTop() - text.getPaddingBottom(); + } + private int getEllipsisCount() { Layout l = mText.getLayout(); if (l != null) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java index 8d74536c7643..772c76642b9e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java @@ -230,6 +230,24 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL mIndicationText.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimensionPixelSize( com.android.internal.R.dimen.text_size_small_material)); + + ViewGroup.LayoutParams lp = mCameraImageView.getLayoutParams(); + lp.width = getResources().getDimensionPixelSize(R.dimen.keyguard_affordance_width); + lp.height = getResources().getDimensionPixelSize(R.dimen.keyguard_affordance_height); + mCameraImageView.setLayoutParams(lp); + mCameraImageView.setImageDrawable(mContext.getDrawable(R.drawable.ic_camera_alt_24dp)); + + lp = mLockIcon.getLayoutParams(); + lp.width = getResources().getDimensionPixelSize(R.dimen.keyguard_affordance_width); + lp.height = getResources().getDimensionPixelSize(R.dimen.keyguard_affordance_height); + mLockIcon.setLayoutParams(lp); + mLockIcon.update(true /* force */); + + lp = mLeftAffordanceView.getLayoutParams(); + lp.width = getResources().getDimensionPixelSize(R.dimen.keyguard_affordance_width); + lp.height = getResources().getDimensionPixelSize(R.dimen.keyguard_affordance_height); + mLeftAffordanceView.setLayoutParams(lp); + updateLeftAffordanceIcon(); } public void setActivityStarter(ActivityStarter activityStarter) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java index e08b945493c9..7db2870620a0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java @@ -58,6 +58,7 @@ public class KeyguardStatusBarView extends RelativeLayout private KeyguardUserSwitcher mKeyguardUserSwitcher; private int mSystemIconsSwitcherHiddenExpandedMargin; + private View mSystemIconsContainer; public KeyguardStatusBarView(Context context, AttributeSet attrs) { super(context, attrs); @@ -67,6 +68,7 @@ public class KeyguardStatusBarView extends RelativeLayout protected void onFinishInflate() { super.onFinishInflate(); mSystemIconsSuperContainer = findViewById(R.id.system_icons_super_container); + mSystemIconsContainer = findViewById(R.id.system_icons_container); mMultiUserSwitch = (MultiUserSwitch) findViewById(R.id.multi_user_switch); mMultiUserAvatar = (ImageView) findViewById(R.id.multi_user_avatar); mBatteryLevel = (TextView) findViewById(R.id.battery_level); @@ -79,17 +81,58 @@ public class KeyguardStatusBarView extends RelativeLayout protected void onConfigurationChanged(Configuration newConfig) { super.onConfigurationChanged(newConfig); - // Respect font size setting. - mCarrierLabel.setTextSize(TypedValue.COMPLEX_UNIT_PX, - getResources().getDimensionPixelSize( - com.android.internal.R.dimen.text_size_small_material)); - mBatteryLevel.setTextSize(TypedValue.COMPLEX_UNIT_PX, - getResources().getDimensionPixelSize(R.dimen.battery_level_text_size)); - MarginLayoutParams lp = (MarginLayoutParams) mMultiUserAvatar.getLayoutParams(); lp.width = lp.height = getResources().getDimensionPixelSize( R.dimen.multi_user_avatar_keyguard_size); mMultiUserAvatar.setLayoutParams(lp); + + lp = (MarginLayoutParams) mMultiUserSwitch.getLayoutParams(); + lp.width = getResources().getDimensionPixelSize( + R.dimen.multi_user_switch_width_keyguard); + lp.setMarginEnd(getResources().getDimensionPixelSize( + R.dimen.multi_user_switch_keyguard_margin)); + mMultiUserSwitch.setLayoutParams(lp); + + lp = (MarginLayoutParams) mSystemIconsSuperContainer.getLayoutParams(); + lp.height = getResources().getDimensionPixelSize( + R.dimen.status_bar_header_height); + lp.setMarginStart(getResources().getDimensionPixelSize( + R.dimen.system_icons_super_container_margin_start)); + mSystemIconsSuperContainer.setLayoutParams(lp); + mSystemIconsSuperContainer.setPaddingRelative(mSystemIconsSuperContainer.getPaddingStart(), + mSystemIconsSuperContainer.getPaddingTop(), + getResources().getDimensionPixelSize(R.dimen.system_icons_keyguard_padding_end), + mSystemIconsSuperContainer.getPaddingBottom()); + + lp = (MarginLayoutParams) mSystemIconsContainer.getLayoutParams(); + lp.height = getResources().getDimensionPixelSize( + R.dimen.status_bar_height); + mSystemIconsContainer.setLayoutParams(lp); + + lp = (MarginLayoutParams) mBatteryLevel.getLayoutParams(); + lp.setMarginStart( + getResources().getDimensionPixelSize(R.dimen.header_battery_margin_keyguard)); + mBatteryLevel.setLayoutParams(lp); + mBatteryLevel.setPaddingRelative(mBatteryLevel.getPaddingStart(), + mBatteryLevel.getPaddingTop(), + getResources().getDimensionPixelSize(R.dimen.battery_level_padding_end), + mBatteryLevel.getPaddingBottom()); + mBatteryLevel.setTextSize(TypedValue.COMPLEX_UNIT_PX, + getResources().getDimensionPixelSize(R.dimen.battery_level_text_size)); + + // Respect font size setting. + mCarrierLabel.setTextSize(TypedValue.COMPLEX_UNIT_PX, + getResources().getDimensionPixelSize( + com.android.internal.R.dimen.text_size_small_material)); + lp = (MarginLayoutParams) mCarrierLabel.getLayoutParams(); + lp.setMarginStart( + getResources().getDimensionPixelSize(R.dimen.keyguard_carrier_text_margin)); + mCarrierLabel.setLayoutParams(lp); + + lp = (MarginLayoutParams) getLayoutParams(); + lp.height = getResources().getDimensionPixelSize( + R.dimen.status_bar_header_height_keyguard); + setLayoutParams(lp); } private void loadDimens() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java index 8e58d14a6e14..ab5ee932f50d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java @@ -17,6 +17,7 @@ package com.android.systemui.statusbar.phone; import android.content.Context; +import android.content.res.Configuration; import android.graphics.drawable.AnimatedVectorDrawable; import android.graphics.drawable.Drawable; import android.graphics.drawable.InsetDrawable; @@ -46,10 +47,11 @@ public class LockIcon extends KeyguardAffordanceView { private boolean mDeviceInteractive; private boolean mScreenOn; private boolean mLastScreenOn; - private final TrustDrawable mTrustDrawable; + private TrustDrawable mTrustDrawable; private final UnlockMethodCache mUnlockMethodCache; private AccessibilityController mAccessibilityController; private boolean mHasFingerPrintIcon; + private int mDensity; public LockIcon(Context context, AttributeSet attrs) { super(context, attrs); @@ -89,7 +91,24 @@ public class LockIcon extends KeyguardAffordanceView { update(); } + @Override + protected void onConfigurationChanged(Configuration newConfig) { + super.onConfigurationChanged(newConfig); + final int density = newConfig.densityDpi; + if (density != mDensity) { + mDensity = density; + mTrustDrawable.stop(); + mTrustDrawable = new TrustDrawable(getContext()); + setBackground(mTrustDrawable); + update(); + } + } + public void update() { + update(false /* force */); + } + + public void update(boolean force) { boolean visible = isShown() && KeyguardUpdateMonitor.getInstance(mContext).isDeviceInteractive(); if (visible) { @@ -103,7 +122,7 @@ public class LockIcon extends KeyguardAffordanceView { boolean useAdditionalPadding = anyFingerprintIcon; boolean trustHidden = anyFingerprintIcon; if (state != mLastState || mDeviceInteractive != mLastDeviceInteractive - || mScreenOn != mLastScreenOn) { + || mScreenOn != mLastScreenOn || force) { boolean isAnim = true; int iconRes = getAnimationResForTransition(mLastState, state, mLastDeviceInteractive, mDeviceInteractive, mLastScreenOn, mScreenOn); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java index 0df12044c46e..9ecff18d2d11 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java @@ -323,12 +323,14 @@ public class NotificationGroupManager implements HeadsUpManager.OnHeadsUpChanged : group.summary.row; } - public void toggleGroupExpansion(StatusBarNotification sbn) { + /** @return group expansion state after toggling. */ + public boolean toggleGroupExpansion(StatusBarNotification sbn) { NotificationGroup group = mGroupMap.get(getGroupKey(sbn)); if (group == null) { - return; + return false; } setGroupExpanded(group, !group.expanded); + return group.expanded; } private boolean isIsolated(StatusBarNotification sbn) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java index 522f2502e256..5064d8eb1d4c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -1735,7 +1735,7 @@ public class NotificationPanelView extends PanelView implements public void onQsHeightChanged() { mQsMaxExpansionHeight = mQsContainer.getDesiredHeight(); - if (mQsExpanded) { + if (mQsExpanded && mQsFullyExpanded) { mQsExpansionHeight = mQsMaxExpansionHeight; requestScrollerTopPaddingUpdate(false /* animate */); requestPanelHeightUpdate(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index 31fa3bf92ade..de5e06ced860 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -997,7 +997,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, private void inflateSignalClusters() { SignalClusterView signalClusterView = reinflateSignalCluster(mStatusBarView); mIconController.setSignalCluster(signalClusterView); - reinflateSignalCluster(mKeyguardStatusView); + reinflateSignalCluster(mKeyguardStatusBar); } private SignalClusterView reinflateSignalCluster(View view) { @@ -3020,7 +3020,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, if ((mSystemUiVisibility & STATUS_OR_NAV_TRANSIENT) != 0 // a transient bar is revealed && event.getAction() == MotionEvent.ACTION_OUTSIDE // touch outside the source bar && event.getX() == 0 && event.getY() == 0 // a touch outside both bars - ) { + && !mRemoteInputController.isRemoteInputActive()) { // not due to typing in IME userAutohide(); } } @@ -4339,6 +4339,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, // ---------------------- DragDownHelper.OnDragDownListener ------------------------------------ + + /* Only ever called as a consequence of a lockscreen expansion gesture. */ @Override public boolean onDraggedDown(View startingChild, int dragLengthY) { if (hasActiveNotifications()) { @@ -4349,6 +4351,10 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, // We have notifications, go to locked shade. goToLockedShade(startingChild); + if (startingChild instanceof ExpandableNotificationRow) { + ExpandableNotificationRow row = (ExpandableNotificationRow) startingChild; + row.onExpandedByGesture(true /* drag down is always an open */); + } return true; } else { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java index 29b4db174375..68e5d0b5bdd3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java @@ -369,13 +369,15 @@ public class QSTileHost implements QSTile.Host, Tunable { } public void addTile(String spec) { - if (mTileSpecs.contains(spec)) { + final String setting = Settings.Secure.getStringForUser(mContext.getContentResolver(), + TILES_SETTING, ActivityManager.getCurrentUser()); + final List<String> tileSpecs = loadTileSpecs(mContext, setting); + if (tileSpecs.contains(spec)) { return; } - ArrayList<String> specs = new ArrayList<>(mTileSpecs); - specs.add(spec); + tileSpecs.add(spec); Settings.Secure.putStringForUser(mContext.getContentResolver(), TILES_SETTING, - TextUtils.join(",", specs), ActivityManager.getCurrentUser()); + TextUtils.join(",", tileSpecs), ActivityManager.getCurrentUser()); } public void addTile(ComponentName tile) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java index 2f522f08a614..7704a07449ac 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java @@ -47,6 +47,7 @@ import android.widget.TextView; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.MetricsProto; import com.android.systemui.R; +import com.android.systemui.statusbar.ExpandableView; import com.android.systemui.statusbar.NotificationData; import com.android.systemui.statusbar.RemoteInputController; import com.android.systemui.statusbar.stack.ScrollContainer; @@ -226,7 +227,7 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene updateSendButton(); } - public void onNotificationUpdate() { + public void onNotificationUpdateOrReset() { boolean sending = mProgressBar.getVisibility() == VISIBLE; if (sending) { @@ -284,11 +285,17 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene private void findScrollContainer() { if (mScrollContainer == null) { + mScrollContainerChild = null; ViewParent p = this; while (p != null) { + if (mScrollContainerChild == null && p instanceof ExpandableView) { + mScrollContainerChild = (View) p; + } if (p.getParent() instanceof ScrollContainer) { mScrollContainer = (ScrollContainer) p.getParent(); - mScrollContainerChild = (View) p; + if (mScrollContainerChild == null) { + mScrollContainerChild = (View) p; + } break; } p = p.getParent(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java index cb0b84827f78..ba191cd1d31e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java @@ -670,6 +670,11 @@ public class NotificationChildrenContainer extends ViewGroup { if (mNotificationHeader != null) { mNotificationHeader.setExpanded(childrenExpanded); } + final int count = mChildren.size(); + for (int childIdx = 0; childIdx < count; childIdx++) { + ExpandableNotificationRow child = mChildren.get(childIdx); + child.setChildrenExpanded(childrenExpanded, false); + } } public void setNotificationParent(ExpandableNotificationRow parent) { @@ -677,6 +682,10 @@ public class NotificationChildrenContainer extends ViewGroup { mHeaderUtil = new NotificationHeaderUtil(mNotificationParent); } + public ExpandableNotificationRow getNotificationParent() { + return mNotificationParent; + } + public NotificationHeaderView getHeaderView() { return mNotificationHeader; } @@ -854,4 +863,23 @@ public class NotificationChildrenContainer extends ViewGroup { child.setRemoved(); } } + + public int getPositionInLinearLayout(View childInGroup) { + int position = mNotificationHeaderMargin + mNotificatonTopPadding; + + for (int i = 0; i < mChildren.size(); i++) { + ExpandableNotificationRow child = mChildren.get(i); + boolean notGone = child.getVisibility() != View.GONE; + if (notGone) { + position += mDividerHeight; + } + if (child == childInGroup) { + return position; + } + if (notGone) { + position += child.getIntrinsicHeight(); + } + } + return 0; + } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java index 19f407492e1f..b58538d03bd0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java @@ -610,9 +610,13 @@ public class NotificationStackScrollLayout extends ViewGroup ExpandableView expandableView = (ExpandableView) mForcedScroll; int positionInLinearLayout = getPositionInLinearLayout(expandableView); int targetScroll = targetScrollForView(expandableView, positionInLinearLayout); + int outOfViewScroll = positionInLinearLayout + expandableView.getIntrinsicHeight(); targetScroll = Math.max(0, Math.min(targetScroll, getScrollRange())); - if (mOwnScrollY < targetScroll || positionInLinearLayout < mOwnScrollY) { + + // Only apply the scroll if we're scrolling the view upwards, or the view is so far up + // that it is not visible anymore. + if (mOwnScrollY < targetScroll || outOfViewScroll < mOwnScrollY) { mOwnScrollY = targetScroll; } } @@ -959,11 +963,13 @@ public class NotificationStackScrollLayout extends ViewGroup && (mIsExpanded || !((ExpandableNotificationRow) v).isPinned()); } + /* Only ever called as a consequence of an expansion gesture in the shade. */ @Override public void setUserExpandedChild(View v, boolean userExpanded) { if (v instanceof ExpandableNotificationRow) { - ((ExpandableNotificationRow) v).setUserExpanded(userExpanded, - true /* allowChildrenExpansion */); + ExpandableNotificationRow row = (ExpandableNotificationRow) v; + row.setUserExpanded(userExpanded, true /* allowChildrenExpansion */); + row.onExpandedByGesture(userExpanded); } } @@ -1032,9 +1038,13 @@ public class NotificationStackScrollLayout extends ViewGroup @Override public boolean scrollTo(View v) { ExpandableView expandableView = (ExpandableView) v; - int targetScroll = targetScrollForView(expandableView, getPositionInLinearLayout(v)); + int positionInLinearLayout = getPositionInLinearLayout(v); + int targetScroll = targetScrollForView(expandableView, positionInLinearLayout); + int outOfViewScroll = positionInLinearLayout + expandableView.getIntrinsicHeight(); - if (mOwnScrollY < targetScroll) { + // Only apply the scroll if we're scrolling the view upwards, or the view is so far up + // that it is not visible anymore. + if (mOwnScrollY < targetScroll || outOfViewScroll < mOwnScrollY) { mScroller.startScroll(mScrollX, mOwnScrollY, 0, targetScroll - mOwnScrollY); mDontReportNextOverScroll = true; postInvalidateOnAnimation(); @@ -1062,6 +1072,10 @@ public class NotificationStackScrollLayout extends ViewGroup // animating away. To work around that we'll wait until things have settled. removeCallbacks(mReclamp); postDelayed(mReclamp, 50); + } else if (mForcedScroll != null) { + // The scroll was requested before we got the actual inset - in case we need + // to scroll up some more do so now. + scrollTo(mForcedScroll); } return insets; } @@ -2361,7 +2375,15 @@ public class NotificationStackScrollLayout extends ViewGroup return view.getHeight(); } - private int getPositionInLinearLayout(View requestedChild) { + private int getPositionInLinearLayout(View requestedView) { + ExpandableNotificationRow childInGroup = null; + ExpandableNotificationRow requestedRow = null; + if (isChildInGroup(requestedView)) { + // We're asking for a child in a group. Calculate the position of the parent first, + // then within the parent. + childInGroup = (ExpandableNotificationRow) requestedView; + requestedView = requestedRow = childInGroup.getNotificationParent(); + } int position = 0; float previousIncreasedAmount = 0.0f; for (int i = 0; i < getChildCount(); i++) { @@ -2377,7 +2399,10 @@ public class NotificationStackScrollLayout extends ViewGroup } previousIncreasedAmount = increasedPaddingAmount; } - if (child == requestedChild) { + if (child == requestedView) { + if (requestedRow != null) { + position += requestedRow.getPositionOfChild(childInGroup); + } return position; } if (notGone) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollState.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollState.java index d6c550678174..8f0cd8e63ee0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollState.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollState.java @@ -26,9 +26,8 @@ import com.android.systemui.statusbar.EmptyShadeView; import com.android.systemui.statusbar.ExpandableNotificationRow; import com.android.systemui.statusbar.ExpandableView; -import java.util.HashMap; import java.util.List; -import java.util.Map; +import java.util.WeakHashMap; /** * A state of a {@link com.android.systemui.statusbar.stack.NotificationStackScrollLayout} which @@ -39,12 +38,12 @@ public class StackScrollState { private static final String CHILD_NOT_FOUND_TAG = "StackScrollStateNoSuchChild"; private final ViewGroup mHostView; - private Map<ExpandableView, StackViewState> mStateMap; + private WeakHashMap<ExpandableView, StackViewState> mStateMap; private final int mClearAllTopPadding; public StackScrollState(ViewGroup hostView) { mHostView = hostView; - mStateMap = new HashMap<ExpandableView, StackViewState>(); + mStateMap = new WeakHashMap<>(); mClearAllTopPadding = hostView.getContext().getResources().getDimensionPixelSize( R.dimen.clear_all_padding_top); } diff --git a/packages/SystemUI/src/com/android/systemui/tv/pip/PipControlButtonView.java b/packages/SystemUI/src/com/android/systemui/tv/pip/PipControlButtonView.java index bcf2f67944a6..80c593c076e9 100644 --- a/packages/SystemUI/src/com/android/systemui/tv/pip/PipControlButtonView.java +++ b/packages/SystemUI/src/com/android/systemui/tv/pip/PipControlButtonView.java @@ -21,12 +21,11 @@ import android.animation.AnimatorInflater; import android.content.Context; import android.content.res.TypedArray; import android.util.AttributeSet; -import android.view.Gravity; import android.view.LayoutInflater; import android.view.View.OnFocusChangeListener; import android.view.View; import android.widget.ImageView; -import android.widget.LinearLayout; +import android.widget.RelativeLayout; import android.widget.TextView; import com.android.systemui.R; @@ -34,31 +33,28 @@ import com.android.systemui.R; /** * A view containing PIP controls including fullscreen, close, and media controls. */ -public class PipControlButtonView extends LinearLayout { +public class PipControlButtonView extends RelativeLayout { private OnFocusChangeListener mFocusChangeListener; - private ImageView mButtonImageView; + private ImageView mIconImageView; + ImageView mButtonImageView; private TextView mDescriptionTextView; - private Animator mFocusGainAnimator; - private Animator mFocusLoseAnimator; + private Animator mTextFocusGainAnimator; + private Animator mButtonFocusGainAnimator; + private Animator mTextFocusLossAnimator; + private Animator mButtonFocusLossAnimator; private final OnFocusChangeListener mInternalFocusChangeListener = new OnFocusChangeListener() { @Override public void onFocusChange(View v, boolean hasFocus) { if (hasFocus) { - if (mFocusLoseAnimator.isStarted()) { - mFocusLoseAnimator.cancel(); - } - mFocusGainAnimator.start(); + startFocusGainAnimation(); } else { - if (mFocusGainAnimator.isStarted()) { - mFocusGainAnimator.cancel(); - } - mFocusLoseAnimator.start(); + startFocusLossAnimation(); } if (mFocusChangeListener != null) { - mFocusChangeListener.onFocusChange(v, hasFocus); + mFocusChangeListener.onFocusChange(PipControlButtonView.this, hasFocus); } } }; @@ -82,9 +78,7 @@ public class PipControlButtonView extends LinearLayout { .getSystemService(Context.LAYOUT_INFLATER_SERVICE); inflater.inflate(R.layout.tv_pip_control_button, this); - setOrientation(LinearLayout.VERTICAL); - setGravity(Gravity.CENTER); - + mIconImageView = (ImageView) findViewById(R.id.icon); mButtonImageView = (ImageView) findViewById(R.id.button); mDescriptionTextView = (TextView) findViewById(R.id.desc); @@ -103,12 +97,19 @@ public class PipControlButtonView extends LinearLayout { super.onFinishInflate(); mButtonImageView.setOnFocusChangeListener(mInternalFocusChangeListener); - mFocusGainAnimator = AnimatorInflater.loadAnimator(getContext(), - R.anim.tv_pip_controls_text_focus_gain_animation); - mFocusGainAnimator.setTarget(mDescriptionTextView); - mFocusLoseAnimator = AnimatorInflater.loadAnimator(getContext(), - R.anim.tv_pip_controls_text_focus_lose_animation); - mFocusLoseAnimator.setTarget(mDescriptionTextView); + mTextFocusGainAnimator = AnimatorInflater.loadAnimator(getContext(), + R.anim.tv_pip_controls_focus_gain_animation); + mTextFocusGainAnimator.setTarget(mDescriptionTextView); + mButtonFocusGainAnimator = AnimatorInflater.loadAnimator(getContext(), + R.anim.tv_pip_controls_focus_gain_animation); + mButtonFocusGainAnimator.setTarget(mButtonImageView); + + mTextFocusLossAnimator = AnimatorInflater.loadAnimator(getContext(), + R.anim.tv_pip_controls_focus_loss_animation); + mTextFocusLossAnimator.setTarget(mDescriptionTextView); + mButtonFocusLossAnimator = AnimatorInflater.loadAnimator(getContext(), + R.anim.tv_pip_controls_focus_loss_animation); + mButtonFocusLossAnimator.setTarget(mButtonImageView); } @Override @@ -125,7 +126,7 @@ public class PipControlButtonView extends LinearLayout { * Sets the drawable for the button with the given resource id. */ public void setImageResource(int resId) { - mButtonImageView.setImageResource(resId); + mIconImageView.setImageResource(resId); } /** @@ -136,8 +137,51 @@ public class PipControlButtonView extends LinearLayout { mDescriptionTextView.setText(resId); } - @Override - public boolean isFocused() { - return mButtonImageView.isFocused(); + private static void cancelAnimator(Animator animator) { + if (animator.isStarted()) { + animator.cancel(); + } + } + + /** + * Starts the focus gain animation. + */ + public void startFocusGainAnimation() { + cancelAnimator(mButtonFocusLossAnimator); + cancelAnimator(mTextFocusLossAnimator); + mTextFocusGainAnimator.start(); + if (mButtonImageView.getAlpha() < 1f) { + // If we had faded out the ripple drawable, run our manual focus change animation. + // See the comment at {@link #startFocusLossAnimation()} for the reason of manual + // animator. + mButtonFocusGainAnimator.start(); + } + } + + /** + * Starts the focus loss animation. + */ + public void startFocusLossAnimation() { + cancelAnimator(mButtonFocusGainAnimator); + cancelAnimator(mTextFocusGainAnimator); + mTextFocusLossAnimator.start(); + if (mButtonImageView.hasFocus()) { + // Button uses ripple that has the default animation for the focus changes. + // Howevever, it doesn't expose the API to fade out while it is focused, + // so we should manually run the fade out animation when PIP controls row loses focus. + mButtonFocusLossAnimator.start(); + } + } + + /** + * Resets to initial state. + */ + public void reset() { + cancelAnimator(mButtonFocusGainAnimator); + cancelAnimator(mTextFocusGainAnimator); + cancelAnimator(mButtonFocusLossAnimator); + cancelAnimator(mTextFocusLossAnimator); + mButtonImageView.setAlpha(1f); + mDescriptionTextView.setAlpha(mButtonImageView.hasFocus() ? 1f : 0f); } } diff --git a/packages/SystemUI/src/com/android/systemui/tv/pip/PipControlsView.java b/packages/SystemUI/src/com/android/systemui/tv/pip/PipControlsView.java index 5614bf9c566b..71740ce1b391 100644 --- a/packages/SystemUI/src/com/android/systemui/tv/pip/PipControlsView.java +++ b/packages/SystemUI/src/com/android/systemui/tv/pip/PipControlsView.java @@ -61,8 +61,7 @@ public class PipControlsView extends LinearLayout { private PipControlButtonView mCloseButtonView; private PipControlButtonView mPlayPauseButtonView; - private boolean mHasFocus; - private OnFocusChangeListener mOnChildFocusChangeListener; + private PipControlButtonView mFocusedChild; private MediaController.Callback mMediaControllerCallback = new MediaController.Callback() { @Override @@ -80,8 +79,12 @@ public class PipControlsView extends LinearLayout { private final OnFocusChangeListener mFocusChangeListener = new OnFocusChangeListener() { @Override - public void onFocusChange(View v, boolean hasFocus) { - onChildViewFocusChanged(); + public void onFocusChange(View view, boolean hasFocus) { + if (hasFocus) { + mFocusedChild = (PipControlButtonView) view; + } else if (mFocusedChild == view) { + mFocusedChild = null; + } } }; @@ -200,23 +203,13 @@ public class PipControlsView extends LinearLayout { } /** - * Sets a listener to be invoked when {@link android.view.View.hasFocus()} is changed. + * Resets to initial state. */ - public void setOnChildFocusChangeListener(OnFocusChangeListener listener) { - mOnChildFocusChangeListener = listener; - } - - private void onChildViewFocusChanged() { - // At this moment, hasFocus() returns true although there's no focused child. - boolean hasFocus = (mFullButtonView != null && mFullButtonView.isFocused()) - || (mPlayPauseButtonView != null && mPlayPauseButtonView.isFocused()) - || (mCloseButtonView != null && mCloseButtonView.isFocused()); - if (mHasFocus != hasFocus) { - mHasFocus = hasFocus; - if (mOnChildFocusChangeListener != null) { - mOnChildFocusChangeListener.onFocusChange(getFocusedChild(), mHasFocus); - } - } + public void reset() { + mFullButtonView.reset(); + mCloseButtonView.reset(); + mPlayPauseButtonView.reset(); + mFullButtonView.requestFocus(); } /** @@ -225,4 +218,11 @@ public class PipControlsView extends LinearLayout { public void setListener(Listener listener) { mListener = listener; } + + /** + * Returns the focused control button view to animate focused button. + */ + PipControlButtonView getFocusedButton() { + return mFocusedChild; + } } diff --git a/packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java b/packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java index 476598d3afc7..30622d29b9a9 100644 --- a/packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java +++ b/packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java @@ -126,7 +126,6 @@ public class PipManager { private int mSuspendPipResizingReason; private Context mContext; - private SystemServicesProxy mSystemServiceProxy; private PipRecentsOverlayManager mPipRecentsOverlayManager; private IActivityManager mActivityManager; private MediaSessionManager mMediaSessionManager; @@ -213,8 +212,7 @@ public class PipManager { mPipBounds = mDefaultPipBounds; mActivityManager = ActivityManagerNative.getDefault(); - mSystemServiceProxy = SystemServicesProxy.getInstance(context); - mSystemServiceProxy.registerTaskStackListener(mTaskStackListener); + SystemServicesProxy.getInstance(context).registerTaskStackListener(mTaskStackListener); IntentFilter intentFilter = new IntentFilter(); intentFilter.addAction(Intent.ACTION_MEDIA_RESOURCE_GRANTED); mContext.registerReceiver(mBroadcastReceiver, intentFilter); diff --git a/packages/SystemUI/src/com/android/systemui/tv/pip/PipRecentsControlsView.java b/packages/SystemUI/src/com/android/systemui/tv/pip/PipRecentsControlsView.java index df44dc1c2362..ffe96afae3a3 100644 --- a/packages/SystemUI/src/com/android/systemui/tv/pip/PipRecentsControlsView.java +++ b/packages/SystemUI/src/com/android/systemui/tv/pip/PipRecentsControlsView.java @@ -48,12 +48,12 @@ public class PipRecentsControlsView extends FrameLayout { abstract void onBackPressed(); } - final PipManager mPipManager = PipManager.getInstance(); + private final PipManager mPipManager = PipManager.getInstance(); private Listener mListener; private PipControlsView mPipControlsView; private View mScrim; private Animator mFocusGainAnimator; - private AnimatorSet mFocusLoseAnimatorSet; + private AnimatorSet mFocusLossAnimatorSet; public PipRecentsControlsView(Context context) { this(context, null, 0, 0); @@ -80,12 +80,12 @@ public class PipRecentsControlsView extends FrameLayout { mScrim = findViewById(R.id.scrim); mFocusGainAnimator = loadAnimator(mPipControlsView, - R.anim.tv_pip_controls_in_recents_focus_gain_animation); + R.anim.tv_pip_controls_in_recents_focus_gain_animation); - mFocusLoseAnimatorSet = new AnimatorSet(); - mFocusLoseAnimatorSet.playSequentially( + mFocusLossAnimatorSet = new AnimatorSet(); + mFocusLossAnimatorSet.playSequentially( loadAnimator(mPipControlsView, - R.anim.tv_pip_controls_in_recents_focus_lose_animation), + R.anim.tv_pip_controls_in_recents_focus_loss_animation), loadAnimator(mScrim, R.anim.tv_pip_controls_in_recents_scrim_fade_in_animation)); Rect pipBounds = mPipManager.getRecentsFocusedPipBounds(); @@ -99,21 +99,29 @@ public class PipRecentsControlsView extends FrameLayout { } /** - * Starts focus gaining animation. + * Starts focus gain animation. */ public void startFocusGainAnimation() { // Hides the scrim view as soon as possible, before the PIP resize animation starts. // If we don't, PIP will be moved down a bit and a gap between the scrim and PIP will be // shown at the bottom of the PIP. mScrim.setAlpha(0); - startAnimator(mFocusGainAnimator, mFocusLoseAnimatorSet); + PipControlButtonView focus = mPipControlsView.getFocusedButton(); + if (focus != null) { + focus.startFocusGainAnimation(); + } + startAnimator(mFocusGainAnimator, mFocusLossAnimatorSet); } /** - * Starts focus losing animation. + * Starts focus loss animation. */ - public void startFocusLoseAnimation() { - startAnimator(mFocusLoseAnimatorSet, mFocusGainAnimator); + public void startFocusLossAnimation() { + PipControlButtonView focus = mPipControlsView.getFocusedButton(); + if (focus != null) { + focus.startFocusLossAnimation(); + } + startAnimator(mFocusLossAnimatorSet, mFocusGainAnimator); } /** @@ -121,14 +129,14 @@ public class PipRecentsControlsView extends FrameLayout { */ public void reset() { cancelAnimator(mFocusGainAnimator); - cancelAnimator(mFocusLoseAnimatorSet); + cancelAnimator(mFocusLossAnimatorSet); // Reset to initial state (i.e. end of focused) - requestFocus(); + mScrim.setAlpha(0); mPipControlsView.setTranslationY(0); mPipControlsView.setScaleX(1); mPipControlsView.setScaleY(1); - mScrim.setAlpha(0); + mPipControlsView.reset(); } private static void startAnimator(Animator animator, Animator previousAnimator) { @@ -153,13 +161,20 @@ public class PipRecentsControlsView extends FrameLayout { @Override public boolean dispatchKeyEvent(KeyEvent event) { - if (!event.isCanceled() - && event.getKeyCode() == KeyEvent.KEYCODE_BACK - && event.getAction() == KeyEvent.ACTION_UP) { - if (mPipControlsView.mListener != null) { - ((PipRecentsControlsView.Listener) mPipControlsView.mListener).onBackPressed(); + if (!event.isCanceled()) { + if (event.getKeyCode() == KeyEvent.KEYCODE_BACK + && event.getAction() == KeyEvent.ACTION_UP) { + if (mPipControlsView.mListener != null) { + ((PipRecentsControlsView.Listener) mPipControlsView.mListener).onBackPressed(); + } + return true; + } else if (event.getKeyCode() == KeyEvent.KEYCODE_DPAD_DOWN) { + if (event.getAction() == KeyEvent.ACTION_DOWN) { + mPipManager.getPipRecentsOverlayManager().clearFocus(); + } + // Consume the down event always to prevent warning logs from ViewRootImpl. + return true; } - return true; } return super.dispatchKeyEvent(event); } diff --git a/packages/SystemUI/src/com/android/systemui/tv/pip/PipRecentsOverlayManager.java b/packages/SystemUI/src/com/android/systemui/tv/pip/PipRecentsOverlayManager.java index 6e4a5938d7b5..895b8a228a00 100644 --- a/packages/SystemUI/src/com/android/systemui/tv/pip/PipRecentsOverlayManager.java +++ b/packages/SystemUI/src/com/android/systemui/tv/pip/PipRecentsOverlayManager.java @@ -18,15 +18,20 @@ package com.android.systemui.tv.pip; import android.content.Context; import android.graphics.PixelFormat; +import android.graphics.Rect; import android.util.Log; import android.view.LayoutInflater; import android.view.View; -import android.view.accessibility.AccessibilityEvent; -import android.view.WindowManager.LayoutParams; import android.view.WindowManager; +import android.view.WindowManager.LayoutParams; +import android.view.accessibility.AccessibilityEvent; import com.android.systemui.R; +import com.android.systemui.recents.misc.SystemServicesProxy; +import static android.view.Gravity.CENTER_HORIZONTAL; +import static android.view.Gravity.TOP; +import static android.view.View.MeasureSpec.UNSPECIFIED; import static com.android.systemui.tv.pip.PipManager.STATE_PIP_OVERLAY; import static com.android.systemui.tv.pip.PipManager.STATE_PIP_RECENTS; import static com.android.systemui.tv.pip.PipManager.STATE_PIP_RECENTS_FOCUSED; @@ -42,13 +47,16 @@ public class PipRecentsOverlayManager { private final PipManager mPipManager = PipManager.getInstance(); private final WindowManager mWindowManager; + private final SystemServicesProxy mSystemServicesProxy; private View mOverlayView; private PipRecentsControlsView mPipControlsView; private View mRecentsView; + private boolean mTalkBackEnabled; - private final LayoutParams mPipRecentsControlsViewLayoutParams; - private final LayoutParams mPipRecentsControlsViewFocusedLayoutParams; + private LayoutParams mPipRecentsControlsViewLayoutParams; + private LayoutParams mPipRecentsControlsViewFocusedLayoutParams; + private boolean mHasFocusableInRecents; private boolean mIsPipRecentsOverlayShown; private boolean mIsRecentsShown; private boolean mIsPipFocusedInRecent; @@ -72,18 +80,7 @@ public class PipRecentsOverlayManager { PipRecentsOverlayManager(Context context) { mWindowManager = (WindowManager) context.getSystemService(WindowManager.class); - - mPipRecentsControlsViewLayoutParams = new WindowManager.LayoutParams( - LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT, - LayoutParams.TYPE_SYSTEM_DIALOG, - LayoutParams.FLAG_NOT_FOCUSABLE | LayoutParams.FLAG_NOT_TOUCHABLE, - PixelFormat.TRANSLUCENT); - mPipRecentsControlsViewFocusedLayoutParams = new WindowManager.LayoutParams( - LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT, - LayoutParams.TYPE_SYSTEM_DIALOG, - 0, - PixelFormat.TRANSLUCENT); - + mSystemServicesProxy = SystemServicesProxy.getInstance(context); initViews(context); } @@ -101,6 +98,20 @@ public class PipRecentsOverlayManager { } } }); + + mOverlayView.measure(UNSPECIFIED, UNSPECIFIED); + mPipRecentsControlsViewLayoutParams = new WindowManager.LayoutParams( + mOverlayView.getMeasuredWidth(), mOverlayView.getMeasuredHeight(), + LayoutParams.TYPE_SYSTEM_DIALOG, + LayoutParams.FLAG_NOT_FOCUSABLE | LayoutParams.FLAG_NOT_TOUCHABLE, + PixelFormat.TRANSLUCENT); + mPipRecentsControlsViewLayoutParams.gravity = TOP | CENTER_HORIZONTAL; + mPipRecentsControlsViewFocusedLayoutParams = new WindowManager.LayoutParams( + mOverlayView.getMeasuredWidth(), mOverlayView.getMeasuredHeight(), + LayoutParams.TYPE_SYSTEM_DIALOG, + 0, + PixelFormat.TRANSLUCENT); + mPipRecentsControlsViewFocusedLayoutParams.gravity = TOP | CENTER_HORIZONTAL; } /** @@ -111,9 +122,10 @@ public class PipRecentsOverlayManager { if (mIsPipRecentsOverlayShown) { return; } + mTalkBackEnabled = mSystemServicesProxy.isTouchExplorationEnabled(); + mRecentsView.setVisibility(mTalkBackEnabled ? View.VISIBLE : View.GONE); mIsPipRecentsOverlayShown = true; mIsPipFocusedInRecent = true; - mPipControlsView.reset(); mWindowManager.addView(mOverlayView, mPipRecentsControlsViewFocusedLayoutParams); } @@ -126,50 +138,46 @@ public class PipRecentsOverlayManager { return; } mWindowManager.removeView(mOverlayView); + // Resets the controls view when its removed. + // If not, changing focus in reset will be show animation when Recents is resumed. + mPipControlsView.reset(); mIsPipRecentsOverlayShown = false; } /** * Request focus to the PIP Recents overlay. - * Called when the PIP view in {@link com.android.systemui.recents.tv.RecentsTvActivity} - * is focused. * This should be called only by {@link com.android.systemui.recents.tv.RecentsTvActivity}. - * @param allowRecentsFocusable {@code true} if Recents can have focus. (i.e. Has a recent task) + * @param hasFocusableInRecents {@code true} if Recents can have focus. (i.e. Has a recent task) */ - public void requestFocus(boolean allowRecentsFocusable) { - mRecentsView.setVisibility(allowRecentsFocusable ? View.VISIBLE : View.GONE); + public void requestFocus(boolean hasFocusableInRecents) { + mHasFocusableInRecents = hasFocusableInRecents; if (!mIsPipRecentsOverlayShown || !mIsRecentsShown || mIsPipFocusedInRecent || !mPipManager.isPipShown()) { return; } mIsPipFocusedInRecent = true; - mPipManager.resizePinnedStack(STATE_PIP_RECENTS_FOCUSED); - - mWindowManager.updateViewLayout(mOverlayView, mPipRecentsControlsViewFocusedLayoutParams); - mPipControlsView.requestFocus(); - mPipControlsView.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED); mPipControlsView.startFocusGainAnimation(); + mWindowManager.updateViewLayout(mOverlayView, mPipRecentsControlsViewFocusedLayoutParams); + mPipManager.resizePinnedStack(STATE_PIP_RECENTS_FOCUSED); + if (mTalkBackEnabled) { + mPipControlsView.requestFocus(); + mPipControlsView.sendAccessibilityEvent( + AccessibilityEvent.TYPE_VIEW_FOCUSED); + } } /** * Request focus to the PIP Recents overlay. - * Called when the PIP view in {@link com.android.systemui.recents.tv.RecentsTvActivity} - * is focused. - * This should be called only by {@link com.android.systemui.recents.tv.RecentsTvActivity}. */ public void clearFocus() { if (!mIsPipRecentsOverlayShown || !mIsRecentsShown || !mIsPipFocusedInRecent - || !mPipManager.isPipShown()) { + || !mPipManager.isPipShown() || !mHasFocusableInRecents) { return; } - if (!mRecentsView.hasFocus()) { - // Let mRecentsView's focus listener handle clearFocus(). - mRecentsView.requestFocus(); - } mIsPipFocusedInRecent = false; - mPipManager.resizePinnedStack(STATE_PIP_RECENTS); + mPipControlsView.startFocusLossAnimation(); mWindowManager.updateViewLayout(mOverlayView, mPipRecentsControlsViewLayoutParams); - mPipControlsView.startFocusLoseAnimation(); + mPipManager.resizePinnedStack(STATE_PIP_RECENTS); if (mCallback != null) { mCallback.onRecentsFocused(); } diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java index 65b93c743a94..c6992aad068e 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java @@ -106,14 +106,14 @@ public class VolumeDialog implements TunerService.Tunable { private ViewGroup mDialogContentView; private ImageButton mExpandButton; private final List<VolumeRow> mRows = new ArrayList<>(); - private final SpTexts mSpTexts; + private SpTexts mSpTexts; private final SparseBooleanArray mDynamic = new SparseBooleanArray(); private final KeyguardManager mKeyguard; private final AudioManager mAudioManager; private final AccessibilityManager mAccessibilityMgr; private int mExpandButtonAnimationDuration; private ZenFooter mZenFooter; - private final LayoutTransition mLayoutTransition; + private LayoutTransition mLayoutTransition; private final Object mSafetyWarningLock = new Object(); private final Accessibility mAccessibility = new Accessibility(); private final ColorStateList mActiveSliderTint; @@ -149,14 +149,11 @@ public class VolumeDialog implements TunerService.Tunable { mCallback = callback; mWindowType = windowType; mZenModeController = zenModeController; - mSpTexts = new SpTexts(mContext); mKeyguard = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE); mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE); mAccessibilityMgr = (AccessibilityManager) mContext.getSystemService(Context.ACCESSIBILITY_SERVICE); mActiveSliderTint = loadColorStateList(R.color.system_accent_color); mInactiveSliderTint = loadColorStateList(R.color.volume_slider_inactive); - mLayoutTransition = new LayoutTransition(); - mLayoutTransition.setDuration(new ValueAnimator().getDuration() / 2); initDialog(); @@ -173,6 +170,9 @@ public class VolumeDialog implements TunerService.Tunable { private void initDialog() { mDialog = new CustomDialog(mContext); + mSpTexts = new SpTexts(mContext); + mLayoutTransition = new LayoutTransition(); + mLayoutTransition.setDuration(new ValueAnimator().getDuration() / 2); mHovering = false; mShowing = false; final Window window = mDialog.getWindow(); @@ -396,6 +396,7 @@ public class VolumeDialog implements TunerService.Tunable { mSpTexts.add(row.header); row.slider = (SeekBar) row.view.findViewById(R.id.volume_row_slider); row.slider.setOnSeekBarChangeListener(new VolumeSeekBarChangeListener(row)); + row.anim = null; // forward events above the slider into the slider row.view.setOnTouchListener(new OnTouchListener() { diff --git a/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java b/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java index 005767f7a09e..65975d9e9f33 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java +++ b/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java @@ -70,16 +70,6 @@ public class ZenFooter extends LinearLayout { } public void init(final ZenModeController controller) { - controller.addCallback(new ZenModeController.Callback() { - @Override - public void onZenChanged(int zen) { - setZen(zen); - } - @Override - public void onConfigChanged(ZenModeConfig config) { - setConfig(config); - } - }); mEndNowButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { @@ -92,6 +82,18 @@ public class ZenFooter extends LinearLayout { update(); } + @Override + protected void onAttachedToWindow() { + super.onAttachedToWindow(); + mController.addCallback(mZenCallback); + } + + @Override + protected void onDetachedFromWindow() { + super.onDetachedFromWindow(); + mController.removeCallback(mZenCallback); + } + private void setZen(int zen) { if (mZen == zen) return; mZen = zen; @@ -143,4 +145,14 @@ public class ZenFooter extends LinearLayout { mSpTexts.update(); } + private final ZenModeController.Callback mZenCallback = new ZenModeController.Callback() { + @Override + public void onZenChanged(int zen) { + setZen(zen); + } + @Override + public void onConfigChanged(ZenModeConfig config) { + setConfig(config); + } + }; } diff --git a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java index fda57eb188ff..15c163f6e281 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java +++ b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java @@ -48,6 +48,7 @@ import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RadioButton; +import android.widget.RadioGroup; import android.widget.TextView; import com.android.internal.logging.MetricsLogger; @@ -102,6 +103,8 @@ public class ZenModePanel extends LinearLayout { private TextView mZenIntroductionCustomize; protected LinearLayout mZenConditions; private TextView mZenAlarmWarning; + private RadioGroup mZenRadioGroup; + private LinearLayout mZenRadioGroupContent; private Callback mCallback; private ZenModeController mController; @@ -117,7 +120,6 @@ public class ZenModePanel extends LinearLayout { private Condition mSessionExitCondition; private Condition[] mConditions; private Condition mTimeCondition; - private Condition mTimeUntilAlarmCondition; private boolean mVoiceCapable; public ZenModePanel(Context context, AttributeSet attrs) { @@ -190,6 +192,8 @@ public class ZenModePanel extends LinearLayout { mZenConditions = (LinearLayout) findViewById(R.id.zen_conditions); mZenAlarmWarning = (TextView) findViewById(R.id.zen_alarm_warning); + mZenRadioGroup = (RadioGroup) findViewById(R.id.zen_radio_buttons); + mZenRadioGroupContent = (LinearLayout) findViewById(R.id.zen_radio_buttons_content); } @Override @@ -227,6 +231,7 @@ public class ZenModePanel extends LinearLayout { mAttachedZen = getSelectedZen(-1); mSessionZen = mAttachedZen; mTransitionHelper.clear(); + mController.addCallback(mZenCallback); setSessionExitCondition(copy(mExitCondition)); updateWidgets(); setRequestingConditions(!mHidden); @@ -240,6 +245,7 @@ public class ZenModePanel extends LinearLayout { mAttached = false; mAttachedZen = -1; mSessionZen = -1; + mController.removeCallback(mZenCallback); setSessionExitCondition(null); setRequestingConditions(false); mTransitionHelper.clear(); @@ -306,7 +312,12 @@ public class ZenModePanel extends LinearLayout { protected void addZenConditions(int count) { for (int i = 0; i < count; i++) { - mZenConditions.addView(mInflater.inflate(R.layout.zen_mode_condition, this, false)); + final View rb = mInflater.inflate(R.layout.zen_mode_button, this, false); + rb.setId(i); + mZenRadioGroup.addView(rb); + final View rbc = mInflater.inflate(R.layout.zen_mode_condition, this, false); + rbc.setId(i + count); + mZenRadioGroupContent.addView(rbc); } } @@ -320,7 +331,6 @@ public class ZenModePanel extends LinearLayout { handleUpdateManualRule(mController.getManualRule()); if (DEBUG) Log.d(mTag, "init mExitCondition=" + mExitCondition); hideAllConditions(); - mController.addCallback(mZenCallback); } public void updateLocale() { @@ -385,7 +395,7 @@ public class ZenModePanel extends LinearLayout { final ConditionTag tag = getConditionTagAt(i); if (tag != null) { if (sameConditionId(tag.condition, mExitCondition)) { - bind(exitCondition, mZenConditions.getChildAt(i), i); + bind(exitCondition, mZenRadioGroupContent.getChildAt(i), i); } } } @@ -481,20 +491,28 @@ public class ZenModePanel extends LinearLayout { final int conditionCount = mConditions == null ? 0 : mConditions.length; if (DEBUG) Log.d(mTag, "handleUpdateConditions conditionCount=" + conditionCount); // forever - bind(forever(), mZenConditions.getChildAt(FOREVER_CONDITION_INDEX), + bind(forever(), mZenRadioGroupContent.getChildAt(FOREVER_CONDITION_INDEX), FOREVER_CONDITION_INDEX); // countdown if (mCountdownConditionSupported && mTimeCondition != null) { - bind(mTimeCondition, mZenConditions.getChildAt(COUNTDOWN_CONDITION_INDEX), + bind(mTimeCondition, mZenRadioGroupContent.getChildAt(COUNTDOWN_CONDITION_INDEX), COUNTDOWN_CONDITION_INDEX); } // countdown until alarm if (mCountdownConditionSupported) { Condition nextAlarmCondition = getTimeUntilNextAlarmCondition(); if (nextAlarmCondition != null) { + mZenRadioGroup.getChildAt( + COUNTDOWN_ALARM_CONDITION_INDEX).setVisibility(View.VISIBLE); + mZenRadioGroupContent.getChildAt( + COUNTDOWN_ALARM_CONDITION_INDEX).setVisibility(View.VISIBLE); bind(nextAlarmCondition, - mZenConditions.getChildAt(COUNTDOWN_ALARM_CONDITION_INDEX), + mZenRadioGroupContent.getChildAt(COUNTDOWN_ALARM_CONDITION_INDEX), COUNTDOWN_ALARM_CONDITION_INDEX); + } else { + mZenRadioGroup.getChildAt(COUNTDOWN_ALARM_CONDITION_INDEX).setVisibility(View.GONE); + mZenRadioGroupContent.getChildAt( + COUNTDOWN_ALARM_CONDITION_INDEX).setVisibility(View.GONE); } } // ensure something is selected @@ -541,22 +559,22 @@ public class ZenModePanel extends LinearLayout { } private ConditionTag getConditionTagAt(int index) { - return (ConditionTag) mZenConditions.getChildAt(index).getTag(); + return (ConditionTag) mZenRadioGroupContent.getChildAt(index).getTag(); } private int getVisibleConditions() { int rt = 0; - final int N = mZenConditions.getChildCount(); + final int N = mZenRadioGroupContent.getChildCount(); for (int i = 0; i < N; i++) { - rt += mZenConditions.getChildAt(i).getVisibility() == VISIBLE ? 1 : 0; + rt += mZenRadioGroupContent.getChildAt(i).getVisibility() == VISIBLE ? 1 : 0; } return rt; } private void hideAllConditions() { - final int N = mZenConditions.getChildCount(); + final int N = mZenRadioGroupContent.getChildCount(); for (int i = 0; i < N; i++) { - mZenConditions.getChildAt(i).setVisibility(GONE); + mZenRadioGroupContent.getChildAt(i).setVisibility(GONE); } } @@ -576,27 +594,14 @@ public class ZenModePanel extends LinearLayout { if (DEBUG) Log.d(mTag, "Selecting a default"); final int favoriteIndex = mPrefs.getMinuteIndex(); if (favoriteIndex == -1 || !mCountdownConditionSupported) { - setChecked(foreverTag.rb, true); + foreverTag.rb.setChecked(true); } else { mTimeCondition = ZenModeConfig.toTimeCondition(mContext, MINUTE_BUCKETS[favoriteIndex], ActivityManager.getCurrentUser()); mBucketIndex = favoriteIndex; - bind(mTimeCondition, mZenConditions.getChildAt(COUNTDOWN_CONDITION_INDEX), + bind(mTimeCondition, mZenRadioGroupContent.getChildAt(COUNTDOWN_CONDITION_INDEX), COUNTDOWN_CONDITION_INDEX); - setChecked(getConditionTagAt(COUNTDOWN_CONDITION_INDEX).rb, true); - } - } - - private void setChecked(RadioButton rb, boolean checked) { - final int N = getVisibleConditions(); - for (int i = 0; i < N; i++) { - final ConditionTag tag = getConditionTagAt(i); - if (tag != null && tag.rb.isChecked() && !Objects.equals(tag.rb, rb)) { - tag.rb.setChecked(false); - } - } - if (rb.isChecked() != checked) { - rb.setChecked(checked); + getConditionTagAt(COUNTDOWN_CONDITION_INDEX).rb.setChecked(true); } } @@ -616,18 +621,18 @@ public class ZenModePanel extends LinearLayout { row.setTag(tag); final boolean first = tag.rb == null; if (tag.rb == null) { - tag.rb = (RadioButton) row.findViewById(android.R.id.checkbox); + tag.rb = (RadioButton) mZenRadioGroup.getChildAt(rowId); } tag.condition = condition; final Uri conditionId = getConditionId(tag.condition); - if (DEBUG) Log.d(mTag, "bind i=" + mZenConditions.indexOfChild(row) + " first=" + first - + " condition=" + conditionId); + if (DEBUG) Log.d(mTag, "bind i=" + mZenRadioGroupContent.indexOfChild(row) + " first=" + + first + " condition=" + conditionId); tag.rb.setEnabled(enabled); tag.rb.setOnCheckedChangeListener(new OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (mExpanded && isChecked) { - setChecked(tag.rb, isChecked); + tag.rb.setChecked(true); if (DEBUG) Log.d(mTag, "onCheckedChanged " + conditionId); MetricsLogger.action(mContext, MetricsEvent.QS_DND_CONDITION_SELECT); select(tag.condition); @@ -678,7 +683,7 @@ public class ZenModePanel extends LinearLayout { tag.lines.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { - setChecked(tag.rb, true); + tag.rb.setChecked(true); } }); @@ -767,7 +772,7 @@ public class ZenModePanel extends LinearLayout { } mTimeCondition = newCondition; bind(mTimeCondition, row, rowId); - setChecked(tag.rb, true); + tag.rb.setChecked(true); select(mTimeCondition); announceConditionSelection(tag); } diff --git a/packages/VpnDialogs/AndroidManifest.xml b/packages/VpnDialogs/AndroidManifest.xml index 08257b63a7ff..a3d27ce8a3da 100644 --- a/packages/VpnDialogs/AndroidManifest.xml +++ b/packages/VpnDialogs/AndroidManifest.xml @@ -20,6 +20,7 @@ package="com.android.vpndialogs"> <uses-permission android:name="android.permission.CONTROL_VPN" /> + <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" /> <application android:label="VpnDialogs" android:allowBackup="false" > diff --git a/packages/VpnDialogs/res/values-pa-rIN/strings.xml b/packages/VpnDialogs/res/values-pa-rIN/strings.xml index ad169f4a4b5a..8e7c73deb2b5 100644 --- a/packages/VpnDialogs/res/values-pa-rIN/strings.xml +++ b/packages/VpnDialogs/res/values-pa-rIN/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="prompt" msgid="3183836924226407828">"ਕਨੈਕਸ਼ਨ ਬੇਨਤੀ"</string> - <string name="warning" msgid="809658604548412033">"<xliff:g id="APP">%s</xliff:g> ਇੱਕ VPN ਕਨੈਕਸ਼ਨ ਸੈਟ ਅਪ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ ਜੋ ਇਸਨੂੰ ਨੈੱਟਵਰਕ ਟ੍ਰੈਫਿਕ ਦਾ ਨਿਰੀਖਣ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ। ਕੇਵਲ ਤਾਂ ਹੀ ਸਵੀਕਾਰ ਕਰੋ ਜੇਕਰ ਤੁਸੀਂ ਸ੍ਰੋਤ ਤੇ ਭਰੋਸਾ ਕਰਦੇ ਹੋ। <br /> <br /> <img src=vpn_icon /> ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਦੇ ਟੌਪ ਤੇ ਪ੍ਰਗਟ ਹੁੰਦਾ ਹੈ ਜਦੋਂ VPN ਸਕਿਰਿਆ ਹੁੰਦਾ ਹੈ।"</string> + <string name="warning" msgid="809658604548412033">"<xliff:g id="APP">%s</xliff:g> ਇੱਕ VPN ਕਨੈਕਸ਼ਨ ਸੈਟ ਅਪ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ ਜੋ ਇਸਨੂੰ ਨੈੱਟਵਰਕ ਟ੍ਰੈਫਿਕ ਦਾ ਨਿਰੀਖਣ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ। ਕੇਵਲ ਤਾਂ ਹੀ ਸਵੀਕਾਰ ਕਰੋ ਜੇਕਰ ਤੁਸੀਂ ਸਰੋਤ ਤੇ ਭਰੋਸਾ ਕਰਦੇ ਹੋ। <br /> <br /> <img src=vpn_icon /> ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਦੇ ਟੌਪ ਤੇ ਪ੍ਰਗਟ ਹੁੰਦਾ ਹੈ ਜਦੋਂ VPN ਸਕਿਰਿਆ ਹੁੰਦਾ ਹੈ।"</string> <string name="legacy_title" msgid="192936250066580964">"VPN ਕਨੈਕਟ ਕੀਤਾ ਗਿਆ ਹੈ"</string> <string name="configure" msgid="4905518375574791375">"ਕੌਂਫਿਗਰ ਕਰੋ"</string> <string name="disconnect" msgid="971412338304200056">"ਡਿਸਕਨੈਕਟ ਕਰੋ"</string> diff --git a/packages/VpnDialogs/src/com/android/vpndialogs/ConfirmDialog.java b/packages/VpnDialogs/src/com/android/vpndialogs/ConfirmDialog.java index f0ca44162dad..72ce9c4efdc0 100644 --- a/packages/VpnDialogs/src/com/android/vpndialogs/ConfirmDialog.java +++ b/packages/VpnDialogs/src/com/android/vpndialogs/ConfirmDialog.java @@ -25,6 +25,7 @@ import android.os.Bundle; import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; +import android.os.UserManager; import android.text.Html; import android.text.Html.ImageGetter; import android.util.Log; @@ -55,6 +56,16 @@ public class ConfirmDialog extends AlertActivity finish(); return; } + if (UserManager.get(this).hasUserRestriction(UserManager.DISALLOW_CONFIG_VPN)) { + finish(); + return; + } + final String alwaysOnVpnPackage = getAlwaysOnVpnPackage(); + // Can't prepare new vpn app when another vpn is always-on + if (alwaysOnVpnPackage != null && !alwaysOnVpnPackage.equals(mPackage)) { + finish(); + return; + } View view = View.inflate(this, R.layout.confirm, null); ((TextView) view.findViewById(R.id.warning)).setText( Html.fromHtml(getString(R.string.warning, getVpnLabel()), @@ -71,6 +82,16 @@ public class ConfirmDialog extends AlertActivity button.setFilterTouchesWhenObscured(true); } + private String getAlwaysOnVpnPackage() { + try { + return mService.getAlwaysOnVpnPackage(UserHandle.myUserId()); + } catch (RemoteException e) { + Log.e(TAG, "fail to call getAlwaysOnVpnPackage", e); + // Fallback to null to show the dialog + return null; + } + } + private boolean prepareVpn() { try { return mService.prepareVpn(mPackage, null, UserHandle.myUserId()); diff --git a/proto/src/metrics_constants.proto b/proto/src/metrics_constants.proto index 46da957ef90f..a1487e368706 100644 --- a/proto/src/metrics_constants.proto +++ b/proto/src/metrics_constants.proto @@ -2206,6 +2206,18 @@ message MetricsEvent { // Settings launched from expanded quick settings. ACTION_QS_EXPANDED_SETTINGS_LAUNCH = 406; + // Notification expansion state toggled by the expand affordance. + ACTION_NOTIFICATION_EXPANDER = 407; + + // Notification group expansion state toggled by the expand affordance. + ACTION_NOTIFICATION_GROUP_EXPANDER = 408; + + // Notification expansion state toggled by the expand gesture. + ACTION_NOTIFICATION_GESTURE_EXPANDER = 409; + + // Notification group expansion state toggled by the expand gesture. + ACTION_NOTIFICATION_GROUP_GESTURE_EXPANDER = 410; + // Add new aosp constants above this line. // END OF AOSP CONSTANTS } diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index 1ab816085660..acc2ec30d67f 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -146,6 +146,7 @@ import java.util.Random; import java.util.Set; import java.util.TreeMap; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; @@ -4664,7 +4665,7 @@ public class BackupManagerService { // a standalone thread. The runner owns this half of the pipe, and closes // it to indicate EOD to the other end. class SinglePackageBackupPreflight implements BackupRestoreTask, FullBackupPreflight { - final AtomicLong mResult = new AtomicLong(); + final AtomicLong mResult = new AtomicLong(BackupTransport.AGENT_ERROR); final CountDownLatch mLatch = new CountDownLatch(1); final IBackupTransport mTransport; @@ -4684,8 +4685,13 @@ public class BackupManagerService { } agent.doMeasureFullBackup(token, mBackupManagerBinder); - // now wait to get our result back - mLatch.await(); + // Now wait to get our result back. If this backstop timeout is reached without + // the latch being thrown, flow will continue as though a result or "normal" + // timeout had been produced. In case of a real backstop timeout, mResult + // will still contain the value it was constructed with, AGENT_ERROR, which + // intentionaly falls into the "just report failure" code. + mLatch.await(TIMEOUT_FULL_BACKUP_INTERVAL, TimeUnit.MILLISECONDS); + long totalSize = mResult.get(); // If preflight timed out, mResult will contain error code as int. if (totalSize < 0) { @@ -4738,7 +4744,7 @@ public class BackupManagerService { @Override public long getExpectedSizeOrErrorCode() { try { - mLatch.await(); + mLatch.await(TIMEOUT_FULL_BACKUP_INTERVAL, TimeUnit.MILLISECONDS); return mResult.get(); } catch (InterruptedException e) { return BackupTransport.NO_MORE_DATA; @@ -4763,8 +4769,8 @@ public class BackupManagerService { mPreflight = new SinglePackageBackupPreflight(transport); mPreflightLatch = new CountDownLatch(1); mBackupLatch = new CountDownLatch(1); - mPreflightResult = BackupTransport.TRANSPORT_OK; - mBackupResult = BackupTransport.TRANSPORT_OK; + mPreflightResult = BackupTransport.AGENT_ERROR; + mBackupResult = BackupTransport.AGENT_ERROR; } @Override @@ -4801,7 +4807,7 @@ public class BackupManagerService { // otherwise return negative error code. long getPreflightResultBlocking() { try { - mPreflightLatch.await(); + mPreflightLatch.await(TIMEOUT_FULL_BACKUP_INTERVAL, TimeUnit.MILLISECONDS); if (mPreflightResult == BackupTransport.TRANSPORT_OK) { return mPreflight.getExpectedSizeOrErrorCode(); } else { @@ -4814,7 +4820,7 @@ public class BackupManagerService { int getBackupResultBlocking() { try { - mBackupLatch.await(); + mBackupLatch.await(TIMEOUT_FULL_BACKUP_INTERVAL, TimeUnit.MILLISECONDS); return mBackupResult; } catch (InterruptedException e) { return BackupTransport.AGENT_ERROR; diff --git a/services/core/java/com/android/server/AttributeCache.java b/services/core/java/com/android/server/AttributeCache.java index 427dbc091ced..57f18c086c56 100644 --- a/services/core/java/com/android/server/AttributeCache.java +++ b/services/core/java/com/android/server/AttributeCache.java @@ -24,10 +24,12 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.content.res.TypedArray; import android.os.UserHandle; +import android.util.ArrayMap; import android.util.SparseArray; -import java.util.HashMap; -import java.util.WeakHashMap; +import com.android.internal.annotations.GuardedBy; + +import java.lang.ref.WeakReference; /** * TODO: This should be better integrated into the system so it doesn't need @@ -35,17 +37,18 @@ import java.util.WeakHashMap; */ public final class AttributeCache { private static AttributeCache sInstance = null; - + private final Context mContext; - private final WeakHashMap<String, Package> mPackages = - new WeakHashMap<String, Package>(); + + @GuardedBy("this") + private final ArrayMap<String, WeakReference<Package>> mPackages = new ArrayMap<>(); + @GuardedBy("this") private final Configuration mConfiguration = new Configuration(); - + public final static class Package { public final Context context; - private final SparseArray<HashMap<int[], Entry>> mMap - = new SparseArray<HashMap<int[], Entry>>(); - + private final SparseArray<ArrayMap<int[], Entry>> mMap = new SparseArray<>(); + public Package(Context c) { context = c; } @@ -59,6 +62,12 @@ public final class AttributeCache { context = c; array = ta; } + + void recycle() { + if (array != null) { + array.recycle(); + } + } } public static void init(Context context) { @@ -74,13 +83,27 @@ public final class AttributeCache { public AttributeCache(Context context) { mContext = context; } - + public void removePackage(String packageName) { synchronized (this) { - mPackages.remove(packageName); + final WeakReference<Package> ref = mPackages.remove(packageName); + final Package pkg = (ref != null) ? ref.get() : null; + if (pkg != null) { + if (pkg.mMap != null) { + for (int i = 0; i < pkg.mMap.size(); i++) { + final ArrayMap<int[], Entry> map = pkg.mMap.valueAt(i); + for (int j = 0; j < map.size(); j++) { + map.valueAt(j).recycle(); + } + } + } + + final Resources res = pkg.context.getResources(); + res.flushLayoutCache(); + } } } - + public void updateConfiguration(Configuration config) { synchronized (this) { int changes = mConfiguration.updateFrom(config); @@ -97,8 +120,9 @@ public final class AttributeCache { public Entry get(String packageName, int resId, int[] styleable, int userId) { synchronized (this) { - Package pkg = mPackages.get(packageName); - HashMap<int[], Entry> map = null; + WeakReference<Package> ref = mPackages.get(packageName); + Package pkg = (ref != null) ? ref.get() : null; + ArrayMap<int[], Entry> map = null; Entry ent = null; if (pkg != null) { map = pkg.mMap.get(resId); @@ -120,11 +144,11 @@ public final class AttributeCache { return null; } pkg = new Package(context); - mPackages.put(packageName, pkg); + mPackages.put(packageName, new WeakReference<>(pkg)); } if (map == null) { - map = new HashMap<int[], Entry>(); + map = new ArrayMap<>(); pkg.mMap.put(resId, map); } diff --git a/services/core/java/com/android/server/BluetoothManagerService.java b/services/core/java/com/android/server/BluetoothManagerService.java index 1f88be55ec6b..3eadb5ca7316 100644 --- a/services/core/java/com/android/server/BluetoothManagerService.java +++ b/services/core/java/com/android/server/BluetoothManagerService.java @@ -639,19 +639,6 @@ class BluetoothManagerService extends IBluetoothManager.Stub { Slog.d(TAG,"enable(): mBluetooth =" + mBluetooth + " mBinding = " + mBinding + " mState = " + mState); } - // We do not honor ON requests when the adapter is already turned ON or in the process of - // turning ON. - // As a protective mechanism to make sure that the native stack gets cleaned up properly - // before turning it back ON we ignore requests while the bluetooth is turning OFF. - // Bug: b/28318203 - if (mState == BluetoothAdapter.STATE_BLE_TURNING_OFF || - mState == BluetoothAdapter.STATE_TURNING_OFF || - mState == BluetoothAdapter.STATE_ON || - mState == BluetoothAdapter.STATE_BLE_ON || - mState == BluetoothAdapter.STATE_TURNING_ON || - mState == BluetoothAdapter.STATE_BLE_TURNING_ON) { - return false; - } synchronized(mReceiver) { mQuietEnableExternal = false; @@ -701,6 +688,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { mBluetoothLock.writeLock().lock(); if (mUnbinding) return; mUnbinding = true; + mHandler.removeMessages(MESSAGE_BLUETOOTH_STATE_CHANGE); if (mBluetooth != null) { //Unregister callback object try { @@ -1165,7 +1153,31 @@ class BluetoothManagerService extends IBluetoothManager.Stub { } mHandler.removeMessages(MESSAGE_RESTART_BLUETOOTH_SERVICE); mEnable = true; - handleEnable(msg.arg1 == 1); + if (mBluetooth == null) { + handleEnable(msg.arg1 == 1); + } else { + // + // We need to wait until transitioned to STATE_OFF and + // the previous Bluetooth process has exited. The + // waiting period has three components: + // (a) Wait until the local state is STATE_OFF. This + // is accomplished by "waitForOnOff(false, true)". + // (b) Wait until the STATE_OFF state is updated to + // all components. + // (c) Wait until the Bluetooth process exits, and + // ActivityManager detects it. + // The waiting for (b) and (c) is accomplished by + // delaying the MESSAGE_RESTART_BLUETOOTH_SERVICE + // message. On slower devices, that delay needs to be + // on the order of (2 * SERVICE_RESTART_TIME_MS). + // + waitForOnOff(false, true); + mQuietEnable = (msg.arg1 == 1); + Message restartMsg = mHandler.obtainMessage( + MESSAGE_RESTART_BLUETOOTH_SERVICE); + mHandler.sendMessageDelayed(restartMsg, + 2 * SERVICE_RESTART_TIME_MS); + } break; case MESSAGE_DISABLE: @@ -1617,14 +1629,11 @@ class BluetoothManagerService extends IBluetoothManager.Stub { if (newState == BluetoothAdapter.STATE_OFF) { // If Bluetooth is off, send service down event to proxy objects, and unbind if (DBG) Slog.d(TAG, "Bluetooth is complete turn off"); - if (canUnbindBluetoothService()) { - if (DBG) Slog.d(TAG, "Good to unbind!"); - sendBluetoothServiceDownCallback(); - unbindAndFinish(); - sendBleStateChanged(prevState, newState); - // Don't broadcast as it has already been broadcast before - isStandardBroadcast = false; - } + sendBluetoothServiceDownCallback(); + unbindAndFinish(); + sendBleStateChanged(prevState, newState); + // Don't broadcast as it has already been broadcast before + isStandardBroadcast = false; } else if (!intermediate_off) { // connect to GattService @@ -1726,25 +1735,6 @@ class BluetoothManagerService extends IBluetoothManager.Stub { quietMode ? 1 : 0, 0)); } - private boolean canUnbindBluetoothService() { - try { - //Only unbind with mEnable flag not set - //For race condition: disable and enable back-to-back - //Avoid unbind right after enable due to callback from disable - //Only unbind with Bluetooth at OFF state - //Only unbind without any MESSAGE_BLUETOOTH_STATE_CHANGE message - mBluetoothLock.readLock().lock(); - if (mEnable || (mBluetooth == null)) return false; - if (mHandler.hasMessages(MESSAGE_BLUETOOTH_STATE_CHANGE)) return false; - return (mBluetooth.getState() == BluetoothAdapter.STATE_OFF); - } catch (RemoteException e) { - Slog.e(TAG, "getState()", e); - } finally { - mBluetoothLock.readLock().unlock(); - } - return false; - } - private void recoverBluetoothServiceFromError() { Slog.e(TAG,"recoverBluetoothServiceFromError"); try { diff --git a/services/core/java/com/android/server/DeviceIdleController.java b/services/core/java/com/android/server/DeviceIdleController.java index 69960c7223d2..bb966f7b0eca 100644 --- a/services/core/java/com/android/server/DeviceIdleController.java +++ b/services/core/java/com/android/server/DeviceIdleController.java @@ -542,6 +542,8 @@ public class DeviceIdleController extends SystemService "mms_temp_app_whitelist_duration"; private static final String KEY_SMS_TEMP_APP_WHITELIST_DURATION = "sms_temp_app_whitelist_duration"; + private static final String KEY_NOTIFICATION_WHITELIST_DURATION = + "notification_whitelist_duration"; /** * This is the time, after becoming inactive, that we go in to the first @@ -752,6 +754,14 @@ public class DeviceIdleController extends SystemService */ public long SMS_TEMP_APP_WHITELIST_DURATION; + /** + * Amount of time we would like to whitelist an app that is handling a + * {@link android.app.PendingIntent} triggered by a {@link android.app.Notification}. + * @see Settings.Global#DEVICE_IDLE_CONSTANTS + * @see #KEY_NOTIFICATION_WHITELIST_DURATION + */ + public long NOTIFICATION_WHITELIST_DURATION; + private final ContentResolver mResolver; private final boolean mHasWatch; private final KeyValueListParser mParser = new KeyValueListParser(','); @@ -842,6 +852,8 @@ public class DeviceIdleController extends SystemService KEY_MMS_TEMP_APP_WHITELIST_DURATION, 60 * 1000L); SMS_TEMP_APP_WHITELIST_DURATION = mParser.getLong( KEY_SMS_TEMP_APP_WHITELIST_DURATION, 20 * 1000L); + NOTIFICATION_WHITELIST_DURATION = mParser.getLong( + KEY_NOTIFICATION_WHITELIST_DURATION, 30 * 1000L); } } @@ -945,6 +957,10 @@ public class DeviceIdleController extends SystemService pw.print(" "); pw.print(KEY_SMS_TEMP_APP_WHITELIST_DURATION); pw.print("="); TimeUtils.formatDuration(SMS_TEMP_APP_WHITELIST_DURATION, pw); pw.println(); + + pw.print(" "); pw.print(KEY_NOTIFICATION_WHITELIST_DURATION); pw.print("="); + TimeUtils.formatDuration(NOTIFICATION_WHITELIST_DURATION, pw); + pw.println(); } } @@ -1252,6 +1268,10 @@ public class DeviceIdleController extends SystemService addPowerSaveTempWhitelistAppDirectInternal(0, appId, duration, sync, reason); } + public long getNotificationWhitelistDuration() { + return mConstants.NOTIFICATION_WHITELIST_DURATION; + } + public void setNetworkPolicyTempWhitelistCallback(Runnable callback) { setNetworkPolicyTempWhitelistCallbackInternal(callback); } @@ -1632,7 +1652,7 @@ public class DeviceIdleController extends SystemService } entry.first.value = timeNow + duration; if (DEBUG) { - Slog.d(TAG, "Adding AppId " + appId + " to temp whitelist"); + Slog.d(TAG, "Adding AppId " + appId + " to temp whitelist. New entry: " + newEntry); } if (newEntry) { // No pending timeout for the app id, post a delayed message @@ -1665,12 +1685,18 @@ public class DeviceIdleController extends SystemService } private void postTempActiveTimeoutMessage(int uid, long delay) { + if (DEBUG) { + Slog.d(TAG, "postTempActiveTimeoutMessage: uid=" + uid + ", delay=" + delay); + } mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_TEMP_APP_WHITELIST_TIMEOUT, uid, 0), delay); } void checkTempAppWhitelistTimeout(int uid) { final long timeNow = SystemClock.elapsedRealtime(); + if (DEBUG) { + Slog.d(TAG, "checkTempAppWhitelistTimeout: uid=" + uid + ", timeNow=" + timeNow); + } synchronized (this) { Pair<MutableLong, String> entry = mTempWhitelistAppIdEndTimes.get(uid); if (entry == null) { @@ -1694,6 +1720,9 @@ public class DeviceIdleController extends SystemService } } else { // Need more time + if (DEBUG) { + Slog.d(TAG, "Time to remove UID " + uid + ": " + entry.first.value); + } postTempActiveTimeoutMessage(uid, entry.first.value - timeNow); } } @@ -2514,6 +2543,8 @@ public class DeviceIdleController extends SystemService pw.println(" Print currently whitelisted apps."); pw.println(" whitelist [package ...]"); pw.println(" Add (prefix with +) or remove (prefix with -) packages."); + pw.println(" tempwhitelist"); + pw.println(" Print packages that are temporarily whitelisted."); pw.println(" tempwhitelist [-u] [package ..]"); pw.println(" Temporarily place packages in whitelist for 10 seconds."); } @@ -2817,8 +2848,7 @@ public class DeviceIdleController extends SystemService pw.println("Failed: " + re); } } else { - pw.println("At least one package name must be specified"); - return -1; + dumpTempWhitelistSchedule(pw, false); } } else { return shell.handleDefaultCommands(cmd); @@ -2943,20 +2973,8 @@ public class DeviceIdleController extends SystemService pw.println(); } } - size = mTempWhitelistAppIdEndTimes.size(); - if (size > 0) { - pw.println(" Temp whitelist schedule:"); - final long timeNow = SystemClock.elapsedRealtime(); - for (int i = 0; i < size; i++) { - pw.print(" UID="); - pw.print(mTempWhitelistAppIdEndTimes.keyAt(i)); - pw.print(": "); - Pair<MutableLong, String> entry = mTempWhitelistAppIdEndTimes.valueAt(i); - TimeUtils.formatDuration(entry.first.value, timeNow, pw); - pw.print(" - "); - pw.println(entry.second); - } - } + dumpTempWhitelistSchedule(pw, true); + size = mTempWhitelistAppIdArray != null ? mTempWhitelistAppIdArray.length : 0; if (size > 0) { pw.println(" Temp whitelist app ids:"); @@ -2968,7 +2986,7 @@ public class DeviceIdleController extends SystemService } pw.print(" mLightEnabled="); pw.print(mLightEnabled); - pw.print(" mDeepEnabled="); pw.println(mDeepEnabled); + pw.print(" mDeepEnabled="); pw.println(mDeepEnabled); pw.print(" mForceIdle="); pw.println(mForceIdle); pw.print(" mMotionSensor="); pw.println(mMotionSensor); pw.print(" mCurDisplay="); pw.println(mCurDisplay); @@ -3040,4 +3058,26 @@ public class DeviceIdleController extends SystemService } } } -} + + void dumpTempWhitelistSchedule(PrintWriter pw, boolean printTitle) { + final int size = mTempWhitelistAppIdEndTimes.size(); + if (size > 0) { + String prefix = ""; + if (printTitle) { + pw.println(" Temp whitelist schedule:"); + prefix = " "; + } + final long timeNow = SystemClock.elapsedRealtime(); + for (int i = 0; i < size; i++) { + pw.print(prefix); + pw.print("UID="); + pw.print(mTempWhitelistAppIdEndTimes.keyAt(i)); + pw.print(": "); + Pair<MutableLong, String> entry = mTempWhitelistAppIdEndTimes.valueAt(i); + TimeUtils.formatDuration(entry.first.value, timeNow, pw); + pw.print(" - "); + pw.println(entry.second); + } + } + } + } diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java index 727bf5c6bec9..5d8fe7c68fe8 100644 --- a/services/core/java/com/android/server/InputMethodManagerService.java +++ b/services/core/java/com/android/server/InputMethodManagerService.java @@ -159,6 +159,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub static final int MSG_BIND_INPUT = 1010; static final int MSG_SHOW_SOFT_INPUT = 1020; static final int MSG_HIDE_SOFT_INPUT = 1030; + static final int MSG_HIDE_CURRENT_INPUT_METHOD = 1035; static final int MSG_ATTACH_TOKEN = 1040; static final int MSG_CREATE_SESSION = 1050; @@ -2846,6 +2847,11 @@ public class InputMethodManagerService extends IInputMethodManager.Stub } args.recycle(); return true; + case MSG_HIDE_CURRENT_INPUT_METHOD: + synchronized (mMethodMap) { + hideCurrentInputLocked(0, null); + } + return true; case MSG_ATTACH_TOKEN: args = (SomeArgs)msg.obj; try { @@ -3880,6 +3886,12 @@ public class InputMethodManagerService extends IInputMethodManager.Stub mHandler.sendMessage(mHandler.obtainMessage(MSG_SWITCH_IME, forwardDirection ? 1 : 0, 0)); } + + @Override + public void hideCurrentInputMethod() { + mHandler.removeMessages(MSG_HIDE_CURRENT_INPUT_METHOD); + mHandler.sendEmptyMessage(MSG_HIDE_CURRENT_INPUT_METHOD); + } } private static String imeWindowStatusToString(final int imeWindowVis) { diff --git a/services/core/java/com/android/server/LockSettingsService.java b/services/core/java/com/android/server/LockSettingsService.java index fbbdccc6bec1..fb1021ee50d7 100644 --- a/services/core/java/com/android/server/LockSettingsService.java +++ b/services/core/java/com/android/server/LockSettingsService.java @@ -50,6 +50,7 @@ import android.os.Parcel; import android.os.Process; import android.os.RemoteException; import android.os.storage.IMountService; +import android.os.storage.StorageManager; import android.os.ServiceManager; import android.os.SystemProperties; import android.os.UserHandle; @@ -355,6 +356,10 @@ public class LockSettingsService extends ILockSettings.Stub { private void showEncryptionNotification(UserHandle user, CharSequence title, CharSequence message, CharSequence detail, PendingIntent intent) { if (DEBUG) Slog.v(TAG, "showing encryption notification, user: " + user.getIdentifier()); + + // Suppress all notifications on non-FBE devices for now + if (!StorageManager.isFileEncryptedNativeOrEmulated()) return; + Notification notification = new Notification.Builder(mContext) .setSmallIcon(com.android.internal.R.drawable.ic_user_secure) .setWhen(0) diff --git a/services/core/java/com/android/server/NetworkScoreService.java b/services/core/java/com/android/server/NetworkScoreService.java index 2a78f908649b..3745e0b4a1f5 100644 --- a/services/core/java/com/android/server/NetworkScoreService.java +++ b/services/core/java/com/android/server/NetworkScoreService.java @@ -17,12 +17,10 @@ package com.android.server; import android.Manifest.permission; -import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; -import android.content.IntentFilter; import android.content.ServiceConnection; import android.content.pm.PackageManager; import android.net.INetworkScoreCache; @@ -33,7 +31,6 @@ import android.net.NetworkScorerAppManager.NetworkScorerAppData; import android.net.ScoredNetwork; import android.os.Binder; import android.os.IBinder; -import android.os.PatternMatcher; import android.os.RemoteException; import android.os.UserHandle; import android.provider.Settings; @@ -42,6 +39,7 @@ import android.util.Log; import com.android.internal.R; import com.android.internal.annotations.GuardedBy; +import com.android.internal.content.PackageMonitor; import java.io.FileDescriptor; import java.io.PrintWriter; @@ -62,39 +60,75 @@ public class NetworkScoreService extends INetworkScoreService.Stub { private final Context mContext; private final Map<Integer, INetworkScoreCache> mScoreCaches; - /** Lock used to update mReceiver when scorer package changes occur. */ - private final Object mReceiverLock = new Object[0]; + /** Lock used to update mPackageMonitor when scorer package changes occur. */ + private final Object mPackageMonitorLock = new Object[0]; - /** Clears scores when the active scorer package is no longer valid. */ - @GuardedBy("mReceiverLock") - private ScorerChangedReceiver mReceiver; + @GuardedBy("mPackageMonitorLock") + private NetworkScorerPackageMonitor mPackageMonitor; private ScoringServiceConnection mServiceConnection; - private class ScorerChangedReceiver extends BroadcastReceiver { + /** + * Clears scores when the active scorer package is no longer valid and + * manages the service connection. + */ + private class NetworkScorerPackageMonitor extends PackageMonitor { final String mRegisteredPackage; - ScorerChangedReceiver(String packageName) { - mRegisteredPackage = packageName; + private NetworkScorerPackageMonitor(String mRegisteredPackage) { + this.mRegisteredPackage = mRegisteredPackage; + } + + @Override + public void onPackageAdded(String packageName, int uid) { + evaluateBinding(packageName, true /* forceUnbind */); + } + + @Override + public void onPackageRemoved(String packageName, int uid) { + evaluateBinding(packageName, true /* forceUnbind */); + } + + @Override + public void onPackageModified(String packageName) { + evaluateBinding(packageName, false /* forceUnbind */); + } + + @Override + public boolean onHandleForceStop(Intent intent, String[] packages, int uid, boolean doit) { + if (doit) { // "doit" means the force stop happened instead of just being queried for. + for (String packageName : packages) { + evaluateBinding(packageName, true /* forceUnbind */); + } + } + return super.onHandleForceStop(intent, packages, uid, doit); } @Override - public void onReceive(Context context, Intent intent) { - String action = intent.getAction(); - if (Intent.ACTION_PACKAGE_CHANGED.equals(action) - || Intent.ACTION_PACKAGE_REPLACED.equals(action) - || Intent.ACTION_PACKAGE_FULLY_REMOVED.equals(action)) { - NetworkScorerAppData activeScorer = + public void onPackageUpdateFinished(String packageName, int uid) { + evaluateBinding(packageName, true /* forceUnbind */); + } + + private void evaluateBinding(String scorerPackageName, boolean forceUnbind) { + if (mRegisteredPackage.equals(scorerPackageName)) { + if (DBG) { + Log.d(TAG, "Evaluating binding for: " + scorerPackageName + + ", forceUnbind=" + forceUnbind); + } + final NetworkScorerAppData activeScorer = NetworkScorerAppManager.getActiveScorer(mContext); if (activeScorer == null) { - // Package change has invalidated a scorer. + // Package change has invalidated a scorer, this will also unbind any service + // connection. Log.i(TAG, "Package " + mRegisteredPackage + " is no longer valid, disabling scoring."); setScorerInternal(null); } else if (activeScorer.mScoringServiceClassName == null) { // The scoring service is not available, make sure it's unbound. unbindFromScoringServiceIfNeeded(); - } else { - // The scoring service may have changed or been added. + } else { // The scoring service changed in some way. + if (forceUnbind) { + unbindFromScoringServiceIfNeeded(); + } bindToScoringServiceIfNeeded(activeScorer); } } @@ -121,7 +155,7 @@ public class NetworkScoreService extends INetworkScoreService.Stub { Settings.Global.putInt(cr, Settings.Global.NETWORK_SCORING_PROVISIONED, 1); } - registerPackageReceiverIfNeeded(); + registerPackageMonitorIfNeeded(); } /** Called when the system is ready for us to start third-party code. */ @@ -130,33 +164,29 @@ public class NetworkScoreService extends INetworkScoreService.Stub { bindToScoringServiceIfNeeded(); } - private void registerPackageReceiverIfNeeded() { - if (DBG) Log.d(TAG, "registerPackageReceiverIfNeeded"); + private void registerPackageMonitorIfNeeded() { + if (DBG) Log.d(TAG, "registerPackageMonitorIfNeeded"); NetworkScorerAppData scorer = NetworkScorerAppManager.getActiveScorer(mContext); - synchronized (mReceiverLock) { - // Unregister the receiver if the current scorer has changed since last registration. - if (mReceiver != null) { - if (Log.isLoggable(TAG, Log.VERBOSE)) { - Log.v(TAG, "Unregistering receiver for " + mReceiver.mRegisteredPackage); + synchronized (mPackageMonitorLock) { + // Unregister the current monitor if needed. + if (mPackageMonitor != null) { + if (DBG) { + Log.d(TAG, "Unregistering package monitor for " + + mPackageMonitor.mRegisteredPackage); } - mContext.unregisterReceiver(mReceiver); - mReceiver = null; + mPackageMonitor.unregister(); + mPackageMonitor = null; } - // Register receiver if a scorer is active. + // Create and register the monitor if a scorer is active. if (scorer != null) { - IntentFilter filter = new IntentFilter(); - filter.addAction(Intent.ACTION_PACKAGE_CHANGED); - filter.addAction(Intent.ACTION_PACKAGE_REPLACED); - filter.addAction(Intent.ACTION_PACKAGE_FULLY_REMOVED); - filter.addDataScheme("package"); - filter.addDataSchemeSpecificPart(scorer.mPackageName, - PatternMatcher.PATTERN_LITERAL); - mReceiver = new ScorerChangedReceiver(scorer.mPackageName); + mPackageMonitor = new NetworkScorerPackageMonitor(scorer.mPackageName); // TODO: Need to update when we support per-user scorers. http://b/23422763 - mContext.registerReceiverAsUser(mReceiver, UserHandle.SYSTEM, filter, null, null); - if (Log.isLoggable(TAG, Log.VERBOSE)) { - Log.v(TAG, "Registered receiver for " + scorer.mPackageName); + mPackageMonitor.register(mContext, null /* thread */, UserHandle.SYSTEM, + false /* externalStorage */); + if (DBG) { + Log.d(TAG, "Registered package monitor for " + + mPackageMonitor.mRegisteredPackage); } } } @@ -299,7 +329,7 @@ public class NetworkScoreService extends INetworkScoreService.Stub { // will be made to bind to the new scorer. bindToScoringServiceIfNeeded(); if (result) { // new scorer successfully set - registerPackageReceiverIfNeeded(); + registerPackageMonitorIfNeeded(); Intent intent = new Intent(NetworkScoreManager.ACTION_SCORER_CHANGED); if (prevScorer != null) { // Directly notify the old scorer. @@ -391,20 +421,24 @@ public class NetworkScoreService extends INetworkScoreService.Stub { private static class ScoringServiceConnection implements ServiceConnection { private final ComponentName mComponentName; private boolean mBound = false; + private boolean mConnected = false; ScoringServiceConnection(ComponentName componentName) { mComponentName = componentName; } void connect(Context context) { - disconnect(context); - Intent service = new Intent(); - service.setComponent(mComponentName); - mBound = context.bindServiceAsUser(service, this, - Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE, - UserHandle.SYSTEM); if (!mBound) { - Log.w(TAG, "Bind call failed for " + service); + Intent service = new Intent(); + service.setComponent(mComponentName); + mBound = context.bindServiceAsUser(service, this, + Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE, + UserHandle.SYSTEM); + if (!mBound) { + Log.w(TAG, "Bind call failed for " + service); + } else { + if (DBG) Log.d(TAG, "ScoringServiceConnection bound."); + } } } @@ -413,6 +447,7 @@ public class NetworkScoreService extends INetworkScoreService.Stub { if (mBound) { mBound = false; context.unbindService(this); + if (DBG) Log.d(TAG, "ScoringServiceConnection unbound."); } } catch (RuntimeException e) { Log.e(TAG, "Unbind failed.", e); @@ -422,15 +457,20 @@ public class NetworkScoreService extends INetworkScoreService.Stub { @Override public void onServiceConnected(ComponentName name, IBinder service) { if (DBG) Log.d(TAG, "ScoringServiceConnection: " + name.flattenToString()); + mConnected = true; } @Override public void onServiceDisconnected(ComponentName name) { - if (DBG) Log.d(TAG, "ScoringServiceConnection, disconnected: " + name.flattenToString()); + if (DBG) { + Log.d(TAG, "ScoringServiceConnection, disconnected: " + name.flattenToString()); + } + mConnected = false; } public void dump(FileDescriptor fd, PrintWriter writer, String[] args) { - writer.println("ScoringServiceConnection: " + mComponentName + ", bound: " + mBound); + writer.println("ScoringServiceConnection: " + mComponentName + ", bound: " + mBound + + ", connected: " + mConnected); } } } diff --git a/services/core/java/com/android/server/VibratorService.java b/services/core/java/com/android/server/VibratorService.java index 4db60d536bdd..7f3eb15c6ebf 100644 --- a/services/core/java/com/android/server/VibratorService.java +++ b/services/core/java/com/android/server/VibratorService.java @@ -306,7 +306,6 @@ public class VibratorService extends IVibratorService.Stub synchronized (mVibrations) { removeVibrationLocked(token); doCancelVibrateLocked(); - mCurrentVibration = vib; addToPreviousVibrationsLocked(vib); startVibrationLocked(vib); } @@ -368,7 +367,6 @@ public class VibratorService extends IVibratorService.Stub } else { // A negative repeat means that this pattern is not meant // to repeat. Treat it like a simple vibration. - mCurrentVibration = vib; startVibrationLocked(vib); } addToPreviousVibrationsLocked(vib); @@ -443,8 +441,7 @@ public class VibratorService extends IVibratorService.Stub mCurrentVibration = null; return; } - mCurrentVibration = mVibrations.getFirst(); - startVibrationLocked(mCurrentVibration); + startVibrationLocked(mVibrations.getFirst()); } // Lock held on mVibrations @@ -466,7 +463,9 @@ public class VibratorService extends IVibratorService.Stub mode = mAppOpsService.startOperation(AppOpsManager.getToken(mAppOpsService), AppOpsManager.OP_VIBRATE, vib.mUid, vib.mOpPkg); } - if (mode != AppOpsManager.MODE_ALLOWED) { + if (mode == AppOpsManager.MODE_ALLOWED) { + mCurrentVibration = vib; + } else { if (mode == AppOpsManager.MODE_ERRORED) { Slog.w(TAG, "Would be an error: vibrate from uid " + vib.mUid); } diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index 95dee019dfa9..dcd9b0c7e643 100755 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -753,7 +753,7 @@ public final class ActiveServices { public void updateServiceConnectionActivitiesLocked(ProcessRecord clientProc) { ArraySet<ProcessRecord> updatedProcesses = null; - for (int i=0; i<clientProc.connections.size(); i++) { + for (int i = 0; i < clientProc.connections.size(); i++) { final ConnectionRecord conn = clientProc.connections.valueAt(i); final ProcessRecord proc = conn.binding.service.app; if (proc == null || proc == clientProc) { @@ -831,8 +831,9 @@ public final class ActiveServices { int clientLabel = 0; PendingIntent clientIntent = null; + final boolean isCallerSystem = callerApp.info.uid == Process.SYSTEM_UID; - if (callerApp.info.uid == Process.SYSTEM_UID) { + if (isCallerSystem) { // Hacky kind of thing -- allow system stuff to tell us // what they are, so we can report this elsewhere for // others to know why certain services are running. @@ -854,6 +855,12 @@ public final class ActiveServices { "BIND_TREAT_LIKE_ACTIVITY"); } + if ((flags & Context.BIND_ALLOW_WHITELIST_MANAGEMENT) != 0 && !isCallerSystem) { + throw new SecurityException( + "Non-system caller " + caller + " (pid=" + Binder.getCallingPid() + + ") set BIND_ALLOW_WHITELIST_MANAGEMENT when binding service " + service); + } + final boolean callerFg = callerApp.setSchedGroup != ProcessList.SCHED_GROUP_BACKGROUND; final boolean isBindExternal = (flags & Context.BIND_EXTERNAL_SERVICE) != 0; @@ -1124,6 +1131,11 @@ public final class ActiveServices { } if (r.binding.service.app != null) { + if (r.binding.service.app.whitelistManager) { + // Must reset flag here because on computeOomAdjLocked() the service + // connection will be gone... + r.binding.service.app.whitelistManager = false; + } // This could have made the service less important. if ((r.flags&Context.BIND_TREAT_LIKE_ACTIVITY) != 0) { r.binding.service.app.treatLikeActivity = true; @@ -2189,11 +2201,11 @@ public final class ActiveServices { // If the app is null, then it was probably removed because the process died, // otherwise wtf if (r.app != null) { - Slog.wtfStack(TAG, "Service done with onDestroy, but not inDestroying: " + Slog.w(TAG, "Service done with onDestroy, but not inDestroying: " + r + ", app=" + r.app); } } else if (r.executeNesting != 1) { - Slog.wtfStack(TAG, "Service done with onDestroy, but executeNesting=" + Slog.w(TAG, "Service done with onDestroy, but executeNesting=" + r.executeNesting + ": " + r); // Fake it to keep from ANR due to orphaned entry. r.executeNesting = 1; diff --git a/services/core/java/com/android/server/am/ActivityManagerDebugConfig.java b/services/core/java/com/android/server/am/ActivityManagerDebugConfig.java index f2bf4f939bad..43bb5ee8d3e4 100644 --- a/services/core/java/com/android/server/am/ActivityManagerDebugConfig.java +++ b/services/core/java/com/android/server/am/ActivityManagerDebugConfig.java @@ -90,6 +90,7 @@ class ActivityManagerDebugConfig { static final boolean DEBUG_VISIBLE_BEHIND = DEBUG_ALL_ACTIVITIES || false; static final boolean DEBUG_USAGE_STATS = DEBUG_ALL || false; static final boolean DEBUG_PERMISSIONS_REVIEW = DEBUG_ALL || false; + static final boolean DEBUG_WHITELISTS = DEBUG_ALL || false; static final String POSTFIX_ADD_REMOVE = (APPEND_CATEGORY_NAME) ? "_AddRemove" : ""; static final String POSTFIX_APP = (APPEND_CATEGORY_NAME) ? "_App" : ""; diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 5400e0ddcbd6..9229b28e6cb7 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -199,6 +199,7 @@ import android.provider.Settings; import android.service.voice.IVoiceInteractionSession; import android.service.voice.VoiceInteractionManagerInternal; import android.service.voice.VoiceInteractionSession; +import android.telecom.TelecomManager; import android.text.format.DateUtils; import android.text.format.Time; import android.text.style.SuggestionSpan; @@ -266,6 +267,7 @@ import static android.app.ActivityManager.StackId.INVALID_STACK_ID; import static android.app.ActivityManager.StackId.LAST_STATIC_STACK_ID; import static android.app.ActivityManager.StackId.PINNED_STACK_ID; import static android.content.pm.PackageManager.FEATURE_FREEFORM_WINDOW_MANAGEMENT; +import static android.content.pm.PackageManager.FEATURE_LEANBACK_ONLY; import static android.content.pm.PackageManager.FEATURE_PICTURE_IN_PICTURE; import static android.content.pm.PackageManager.GET_PROVIDERS; import static android.content.pm.PackageManager.MATCH_DEBUG_TRIAGED_MISSING; @@ -320,6 +322,7 @@ import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_URI_PERMISS import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_USAGE_STATS; import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_VISIBILITY; import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_VISIBLE_BEHIND; +import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_WHITELISTS; import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_BACKUP; import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_BROADCAST; import static com.android.server.am.ActivityManagerDebugConfig.POSTFIX_CLEANUP; @@ -1344,6 +1347,7 @@ public final class ActivityManagerService extends ActivityManagerNative boolean mSupportsMultiWindow; boolean mSupportsFreeformWindowManagement; boolean mSupportsPictureInPicture; + boolean mSupportsLeanbackOnly; Rect mDefaultPinnedStackBounds; IActivityController mController = null; boolean mControllerIsAMonkey = false; @@ -5419,9 +5423,32 @@ public final class ActivityManagerService extends ActivityManagerNative } } + final int pkgUidF = pkgUid; + final int userIdF = userId; + final IPackageDataObserver localObserver = new IPackageDataObserver.Stub() { + @Override + public void onRemoveCompleted(String packageName, boolean succeeded) + throws RemoteException { + synchronized (ActivityManagerService.this) { + finishForceStopPackageLocked(packageName, pkgUidF); + } + + final Intent intent = new Intent(Intent.ACTION_PACKAGE_DATA_CLEARED, + Uri.fromParts("package", packageName, null)); + intent.putExtra(Intent.EXTRA_UID, pkgUidF); + intent.putExtra(Intent.EXTRA_USER_HANDLE, UserHandle.getUserId(pkgUidF)); + broadcastIntentInPackage("android", Process.SYSTEM_UID, intent, + null, null, 0, null, null, null, null, false, false, userIdF); + + if (observer != null) { + observer.onRemoveCompleted(packageName, succeeded); + } + } + }; + try { // Clear application user data - pm.clearApplicationUserData(packageName, observer, userId); + pm.clearApplicationUserData(packageName, localObserver, userId); synchronized(this) { // Remove all permissions granted from/to this package @@ -5433,12 +5460,6 @@ public final class ActivityManagerService extends ActivityManagerNative inm.removeAutomaticZenRules(packageName); inm.setNotificationPolicyAccessGranted(packageName, false); - Intent intent = new Intent(Intent.ACTION_PACKAGE_DATA_CLEARED, - Uri.fromParts("package", packageName, null)); - intent.putExtra(Intent.EXTRA_UID, pkgUid); - intent.putExtra(Intent.EXTRA_USER_HANDLE, UserHandle.getUserId(pkgUid)); - broadcastIntentInPackage("android", Process.SYSTEM_UID, intent, - null, null, 0, null, null, null, null, false, false, userId); } catch (RemoteException e) { } } finally { @@ -5623,6 +5644,7 @@ public final class ActivityManagerService extends ActivityManagerNative } if (mUserController.isUserRunningLocked(user, 0)) { forceStopPackageLocked(packageName, pkgUid, "from pid " + callingPid); + finishForceStopPackageLocked(packageName, pkgUid); } } } @@ -5814,6 +5836,9 @@ public final class ActivityManagerService extends ActivityManagerNative private void forceStopPackageLocked(final String packageName, int uid, String reason) { forceStopPackageLocked(packageName, UserHandle.getAppId(uid), false, false, true, false, false, UserHandle.getUserId(uid), reason); + } + + private void finishForceStopPackageLocked(final String packageName, int uid) { Intent intent = new Intent(Intent.ACTION_PACKAGE_RESTARTED, Uri.fromParts("package", packageName, null)); if (!mProcessesReady) { @@ -7112,6 +7137,41 @@ public final class ActivityManagerService extends ActivityManagerNative } } + /** + * Whitelists {@code targetUid} to temporarily bypass Power Save mode. + * + * <p>{@code callerUid} must be allowed to request such whitelist by calling + * {@link #addTempPowerSaveWhitelistGrantorUid(int)}. + */ + void tempWhitelistAppForPowerSave(int callerPid, int callerUid, int targetUid, long duration) { + if (DEBUG_WHITELISTS) { + Slog.d(TAG, "tempWhitelistAppForPowerSave(" + callerPid + ", " + callerUid + ", " + + targetUid + ", " + duration + ")"); + } + synchronized (mPidsSelfLocked) { + final ProcessRecord pr = mPidsSelfLocked.get(callerPid); + if (pr == null) { + Slog.w(TAG, "tempWhitelistAppForPowerSave() no ProcessRecord for pid " + callerPid); + return; + } + if (!pr.whitelistManager) { + if (DEBUG_WHITELISTS) { + Slog.d(TAG, "tempWhitelistAppForPowerSave() for target " + targetUid + ": pid " + + callerPid + " is not allowed"); + } + return; + } + } + + final long token = Binder.clearCallingIdentity(); + try { + mLocalDeviceIdleController.addPowerSaveTempWhitelistAppDirect(targetUid, duration, + true, "pe from uid:" + callerUid); + } finally { + Binder.restoreCallingIdentity(token); + } + } + @Override public void cancelIntentSender(IIntentSender sender) { if (!(sender instanceof PendingIntentRecord)) { @@ -10108,6 +10168,10 @@ public final class ActivityManagerService extends ActivityManagerNative mStackSupervisor.setLockTaskModeLocked(null, ActivityManager.LOCK_TASK_MODE_NONE, "stopLockTask", true); } + TelecomManager tm = (TelecomManager) mContext.getSystemService(Context.TELECOM_SERVICE); + if (tm != null) { + tm.showInCallScreen(false); + } } finally { Binder.restoreCallingIdentity(ident); } @@ -10170,6 +10234,7 @@ public final class ActivityManagerService extends ActivityManagerNative int N = providers.size(); app.pubProviders.ensureCapacity(N + app.pubProviders.size()); for (int i=0; i<N; i++) { + // TODO: keep logic in sync with installEncryptionUnawareProviders ProviderInfo cpi = (ProviderInfo)providers.get(i); boolean singleton = isSingleton(cpi.processName, cpi.applicationInfo, @@ -11150,12 +11215,18 @@ public final class ActivityManagerService extends ActivityManagerNative final PackageInfo pkgInfo = AppGlobals.getPackageManager() .getPackageInfo(pkgName, matchFlags, userId); if (pkgInfo != null && !ArrayUtils.isEmpty(pkgInfo.providers)) { - for (ProviderInfo provInfo : pkgInfo.providers) { - if (Objects.equals(provInfo.processName, app.processName)) { - Log.v(TAG, "Installing " + provInfo); - app.thread.scheduleInstallProvider(provInfo); + for (ProviderInfo pi : pkgInfo.providers) { + // TODO: keep in sync with generateApplicationProvidersLocked + final boolean processMatch = Objects.equals(pi.processName, + app.processName) || pi.multiprocess; + final boolean userMatch = isSingleton(pi.processName, + pi.applicationInfo, pi.name, pi.flags) + ? (app.userId == UserHandle.USER_SYSTEM) : true; + if (processMatch && userMatch) { + Log.v(TAG, "Installing " + pi); + app.thread.scheduleInstallProvider(pi); } else { - Log.v(TAG, "Skipping " + provInfo); + Log.v(TAG, "Skipping " + pi); } } } @@ -11201,6 +11272,9 @@ public final class ActivityManagerService extends ActivityManagerNative } catch (RemoteException e) { Log.w(TAG, "Content provider dead retrieving " + uri, e); return null; + } catch (Exception e) { + Log.w(TAG, "Exception while determining type of " + uri, e); + return null; } finally { // We need to clear the identity to call removeContentProviderExternalUnchecked if (!clearedIdentity) { @@ -12785,6 +12859,9 @@ public final class ActivityManagerService extends ActivityManagerNative final boolean forceRtl = Settings.Global.getInt(resolver, DEVELOPMENT_FORCE_RTL, 0) != 0; final boolean forceResizable = Settings.Global.getInt( resolver, DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES, 0) != 0; + final boolean supportsLeanbackOnly = + mContext.getPackageManager().hasSystemFeature(FEATURE_LEANBACK_ONLY); + // Transfer any global setting for forcing RTL layout, into a System Property SystemProperties.set(DEVELOPMENT_FORCE_RTL, forceRtl ? "1":"0"); @@ -12800,6 +12877,7 @@ public final class ActivityManagerService extends ActivityManagerNative mWaitForDebugger = mOrigWaitForDebugger = waitForDebugger; mAlwaysFinishActivities = alwaysFinishActivities; mLenientBackgroundCheck = lenientBackgroundCheck; + mSupportsLeanbackOnly = supportsLeanbackOnly; mForceResizableActivities = forceResizable; mWindowManager.setForceResizableTasks(mForceResizableActivities); if (supportsMultiWindow || forceResizable) { @@ -18787,7 +18865,7 @@ public final class ActivityManagerService extends ActivityManagerNative for (int j = 0; j < activitiesSize; j++) { final ActivityRecord r = app.activities.get(j); if (r.app != app) { - Log.wtf(TAG, "Found activity " + r + " in proc activity list using " + r.app + Log.e(TAG, "Found activity " + r + " in proc activity list using " + r.app + " instead of expected " + app); if (r.app == null || (r.app.uid == app.uid)) { // Only fix things up when they look sane @@ -18989,6 +19067,9 @@ public final class ActivityManagerService extends ActivityManagerNative } } } + + app.whitelistManager = false; + for (int conni = s.connections.size()-1; conni >= 0 && (adj > ProcessList.FOREGROUND_APP_ADJ || schedGroup == ProcessList.SCHED_GROUP_BACKGROUND @@ -19007,6 +19088,10 @@ public final class ActivityManagerService extends ActivityManagerNative // Binding to ourself is not interesting. continue; } + if ((cr.flags & Context.BIND_ALLOW_WHITELIST_MANAGEMENT) != 0) { + app.whitelistManager = true; + } + if ((cr.flags&Context.BIND_WAIVE_PRIORITY) == 0) { ProcessRecord client = cr.binding.client; int clientAdj = computeOomAdjLocked(client, cachedAdj, @@ -21278,6 +21363,15 @@ public final class ActivityManagerService extends ActivityManagerNative } } } + + @Override + public void setPendingIntentWhitelistDuration(IIntentSender target, long duration) { + if (!(target instanceof PendingIntentRecord)) { + Slog.w(TAG, "markAsSentFromNotification(): not a PendingIntentRecord: " + target); + return; + } + ((PendingIntentRecord) target).setWhitelistDuration(duration); + } } private final class SleepTokenImpl extends SleepToken { diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index 8b637e0ae44d..4439a24a4b07 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -73,7 +73,6 @@ import static com.android.server.am.ActivityRecord.HOME_ACTIVITY_TYPE; import static com.android.server.am.ActivityRecord.STARTING_WINDOW_REMOVED; import static com.android.server.am.ActivityRecord.STARTING_WINDOW_SHOWN; import static com.android.server.am.ActivityStackSupervisor.FindTaskResult; -import static com.android.server.am.ActivityStackSupervisor.MOVING; import static com.android.server.am.ActivityStackSupervisor.ON_TOP; import static com.android.server.am.ActivityStackSupervisor.PRESERVE_WINDOWS; import static com.android.server.wm.AppTransition.TRANSIT_ACTIVITY_CLOSE; @@ -786,17 +785,8 @@ final class ActivityStack { + taskIntent.getComponent().flattenToShortString() + "/aff=" + r.task.rootAffinity + " to new cls=" + intent.getComponent().flattenToShortString() + "/aff=" + info.taskAffinity); - if (!isDocument && !taskIsDocument - && result.r == null && task.canMatchRootAffinity()) { - if (task.rootAffinity.equals(target.taskAffinity)) { - if (DEBUG_TASKS) Slog.d(TAG_TASKS, "Found matching affinity candidate!"); - // It is possible for multiple tasks to have the same root affinity especially - // if they are in separate stacks. We save off this candidate, but keep looking - // to see if there is a better candidate. - result.r = r; - result.matchedByRootAffinity = true; - } - } else if (taskIntent != null && taskIntent.getComponent() != null && + // TODO Refactor to remove duplications. Check if logic can be simplified. + if (taskIntent != null && taskIntent.getComponent() != null && taskIntent.getComponent().compareTo(cls) == 0 && Objects.equals(documentData, taskDocumentData)) { if (DEBUG_TASKS) Slog.d(TAG_TASKS, "Found matching class!"); @@ -816,6 +806,16 @@ final class ActivityStack { result.r = r; result.matchedByRootAffinity = false; break; + } else if (!isDocument && !taskIsDocument + && result.r == null && task.canMatchRootAffinity()) { + if (task.rootAffinity.equals(target.taskAffinity)) { + if (DEBUG_TASKS) Slog.d(TAG_TASKS, "Found matching affinity candidate!"); + // It is possible for multiple tasks to have the same root affinity especially + // if they are in separate stacks. We save off this candidate, but keep looking + // to see if there is a better candidate. + result.r = r; + result.matchedByRootAffinity = true; + } } else if (DEBUG_TASKS) Slog.d(TAG_TASKS, "Not a match: " + task); } } @@ -1832,9 +1832,9 @@ final class ActivityStack { boolean isVisible = !behindFullscreenActivity || r.mLaunchTaskBehind || activityVisibleBehind; - if (isVisible && r.isRecentsActivity()) { - // Recents activity can only be visible if the home stack is the focused stack or we are - // in split-screen mode. + if (mService.mSupportsLeanbackOnly && isVisible && r.isRecentsActivity()) { + // On devices that support leanback only (Android TV), Recents activity can only be + // visible if the home stack is the focused stack or we are in split-screen mode. isVisible = mStackSupervisor.getStack(DOCKED_STACK_ID) != null || mStackSupervisor.isFocusedStack(this); } @@ -4464,6 +4464,7 @@ final class ActivityStack { // Short circuit: if the two configurations are equal (the common case), then there is // nothing to do. final Configuration newConfig = mService.mConfiguration; + r.task.sanitizeOverrideConfiguration(newConfig); final Configuration taskConfig = r.task.mOverrideConfig; if (r.configuration.equals(newConfig) && r.taskConfigOverride.equals(taskConfig) diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index 01b2eb4607eb..0e4c9a4d9773 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -1338,7 +1338,9 @@ public final class ActivityStackSupervisor implements DisplayListener { // Update any services we are bound to that might care about whether // their client may have activities. - mService.mServices.updateServiceConnectionActivitiesLocked(r.app); + if (r.app != null) { + mService.mServices.updateServiceConnectionActivitiesLocked(r.app); + } return true; } @@ -3523,7 +3525,9 @@ public final class ActivityStackSupervisor implements DisplayListener { } void showLockTaskToast() { - mLockTaskNotify.showToast(mLockTaskModeState); + if (mLockTaskNotify != null) { + mLockTaskNotify.showToast(mLockTaskModeState); + } } void showLockTaskEscapeMessageLocked(TaskRecord task) { @@ -4400,6 +4404,12 @@ public final class ActivityStackSupervisor implements DisplayListener { "startActivityFromRecentsInner: Task " + taskId + " not found."); } + // Since we don't have an actual source record here, we assume that the currently focused + // activity was the source. + final ActivityStack focusedStack = getFocusedStack(); + final ActivityRecord sourceRecord = + focusedStack != null ? focusedStack.topActivity() : null; + if (launchStackId != INVALID_STACK_ID) { if (task.stack.mStackId != launchStackId) { moveTaskToStackLocked( @@ -4423,6 +4433,11 @@ public final class ActivityStackSupervisor implements DisplayListener { if (launchStackId == DOCKED_STACK_ID) { setResizingDuringAnimation(taskId); } + + mService.mActivityStarter.postStartActivityUncheckedProcessing(task.getTopActivity(), + ActivityManager.START_TASK_TO_FRONT, + sourceRecord != null ? sourceRecord.task.stack.mStackId : INVALID_STACK_ID, + sourceRecord, task.stack); return ActivityManager.START_TASK_TO_FRONT; } callingUid = task.mCallingUid; diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java index dc4d7b1d8a05..61b131761b15 100644 --- a/services/core/java/com/android/server/am/ActivityStarter.java +++ b/services/core/java/com/android/server/am/ActivityStarter.java @@ -536,12 +536,13 @@ class ActivityStarter { } finally { mService.mWindowManager.continueSurfaceLayout(); } - postStartActivityUncheckedProcessing(r, err, stack.mStackId); + postStartActivityUncheckedProcessing(r, err, stack.mStackId, mSourceRecord, mTargetStack); return err; } void postStartActivityUncheckedProcessing( - ActivityRecord r, int result, int prevFocusedStackId) { + ActivityRecord r, int result, int prevFocusedStackId, ActivityRecord sourceRecord, + ActivityStack targetStack) { if (result < START_SUCCESS) { // If someone asked to have the keyguard dismissed on the next activity start, @@ -555,10 +556,19 @@ class ActivityStarter { if (r.task != null && r.task.stack != null) { startedActivityStackId = r.task.stack.mStackId; } else if (mTargetStack != null) { - startedActivityStackId = mTargetStack.mStackId; - } - - if (startedActivityStackId == DOCKED_STACK_ID && prevFocusedStackId == HOME_STACK_ID) { + startedActivityStackId = targetStack.mStackId; + } + + // If we launched the activity from a no display activity that was launched from the home + // screen, we also need to start recents to un-minimize the docked stack, since the + // noDisplay activity will be finished shortly after. + // TODO: We should prevent noDisplay activities from affecting task/stack ordering and + // visibility instead of using this flag. + final boolean noDisplayActivityOverHome = sourceRecord != null + && sourceRecord.noDisplay + && sourceRecord.task.getTaskToReturnTo() == HOME_ACTIVITY_TYPE; + if (startedActivityStackId == DOCKED_STACK_ID + && (prevFocusedStackId == HOME_STACK_ID || noDisplayActivityOverHome)) { final ActivityStack homeStack = mSupervisor.getStack(HOME_STACK_ID); final ActivityRecord topActivityHomeStack = homeStack != null ? homeStack.topRunningActivityLocked() : null; @@ -1547,7 +1557,7 @@ class ActivityStarter { } intentActivity.deliverNewIntentLocked(mCallingUid, mStartActivity.intent, mStartActivity.launchedFromPackage); - } else if (!intentActivity.task.isSameIntentResolution(mStartActivity)) { + } else if (!intentActivity.task.isSameIntentFilter(mStartActivity)) { // In this case we are launching the root activity of the task, but with a // different intent. We should start a new instance on top. mAddingToTask = true; @@ -1779,7 +1789,8 @@ class ActivityStarter { final int result = startActivityUnchecked( pal.r, pal.sourceRecord, null, null, pal.startFlags, resume, null, null); postStartActivityUncheckedProcessing( - pal.r, result, mSupervisor.mFocusedStack.mStackId); + pal.r, result, mSupervisor.mFocusedStack.mStackId, mSourceRecord, + mTargetStack); } catch (Exception e) { Slog.e(TAG, "Exception during pending activity launch pal=" + pal, e); pal.sendErrorResult(e.getMessage()); diff --git a/services/core/java/com/android/server/am/AppErrorDialog.java b/services/core/java/com/android/server/am/AppErrorDialog.java index ddfab4d6dd84..e37feb264155 100644 --- a/services/core/java/com/android/server/am/AppErrorDialog.java +++ b/services/core/java/com/android/server/am/AppErrorDialog.java @@ -18,13 +18,17 @@ package com.android.server.am; import android.app.ActivityManagerInternal; import android.app.ActivityOptions; +import android.content.BroadcastReceiver; import android.content.Context; +import android.content.Intent; +import android.content.IntentFilter; import android.content.pm.IPackageDataObserver; import android.content.pm.PackageManager; import android.content.res.Resources; import android.os.Bundle; import android.os.Handler; import android.os.Message; +import android.provider.Settings; import android.text.BidiFormatter; import android.util.Slog; import android.view.LayoutInflater; @@ -43,6 +47,7 @@ final class AppErrorDialog extends BaseErrorDialog implements View.OnClickListen private final AppErrorResult mResult; private final ProcessRecord mProc; private final boolean mRepeating; + private final boolean mForeground; private CharSequence mName; @@ -54,9 +59,9 @@ final class AppErrorDialog extends BaseErrorDialog implements View.OnClickListen static final int FORCE_QUIT = 1; static final int FORCE_QUIT_AND_REPORT = 2; static final int RESTART = 3; - static final int RESET = 4; static final int MUTE = 5; static final int TIMEOUT = 6; + static final int CANCEL = 7; // 5-minute timeout, then we automatically dismiss the crash dialog static final long DISMISS_TIMEOUT = 1000 * 60 * 5; @@ -69,6 +74,7 @@ final class AppErrorDialog extends BaseErrorDialog implements View.OnClickListen mProc = data.proc; mResult = data.result; mRepeating = data.repeating; + mForeground = data.task != null; BidiFormatter bidi = BidiFormatter.getInstance(); if ((mProc.pkgList.size() == 1) && @@ -86,7 +92,8 @@ final class AppErrorDialog extends BaseErrorDialog implements View.OnClickListen bidi.unicodeWrap(mName.toString()))); } - setCancelable(false); + setCancelable(true); + setCancelMessage(mHandler.obtainMessage(CANCEL)); WindowManager.LayoutParams attrs = getWindow().getAttributes(); attrs.setTitle("Application Error: " + mProc.info.processName); @@ -111,25 +118,41 @@ final class AppErrorDialog extends BaseErrorDialog implements View.OnClickListen LayoutInflater.from(context).inflate( com.android.internal.R.layout.app_error_dialog, frame, true); + boolean hasRestart = !mRepeating && mForeground; + final boolean hasReceiver = mProc.errorReportReceiver != null; + final TextView restart = (TextView) findViewById(com.android.internal.R.id.aerr_restart); restart.setOnClickListener(this); - restart.setVisibility(!mRepeating ? View.VISIBLE : View.GONE); - final TextView reset = (TextView) findViewById(com.android.internal.R.id.aerr_reset); - reset.setOnClickListener(this); - reset.setVisibility(mRepeating ? View.VISIBLE : View.GONE); + restart.setVisibility(hasRestart ? View.VISIBLE : View.GONE); final TextView report = (TextView) findViewById(com.android.internal.R.id.aerr_report); report.setOnClickListener(this); - final boolean hasReceiver = mProc.errorReportReceiver != null; report.setVisibility(hasReceiver ? View.VISIBLE : View.GONE); final TextView close = (TextView) findViewById(com.android.internal.R.id.aerr_close); + close.setVisibility(!hasRestart ? View.VISIBLE : View.GONE); close.setOnClickListener(this); + + boolean showMute = !IS_USER_BUILD && Settings.Global.getInt(context.getContentResolver(), + Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0; final TextView mute = (TextView) findViewById(com.android.internal.R.id.aerr_mute); mute.setOnClickListener(this); - mute.setVisibility(!IS_USER_BUILD ? View.VISIBLE : View.GONE); + mute.setVisibility(showMute ? View.VISIBLE : View.GONE); findViewById(com.android.internal.R.id.customPanel).setVisibility(View.VISIBLE); } + @Override + public void onStart() { + super.onStart(); + getContext().registerReceiver(mReceiver, + new IntentFilter(Intent.ACTION_CLOSE_SYSTEM_DIALOGS)); + } + + @Override + protected void onStop() { + super.onStop(); + getContext().unregisterReceiver(mReceiver); + } + private final Handler mHandler = new Handler() { public void handleMessage(Message msg) { final int result = msg.what; @@ -163,9 +186,6 @@ final class AppErrorDialog extends BaseErrorDialog implements View.OnClickListen case com.android.internal.R.id.aerr_restart: mHandler.obtainMessage(RESTART).sendToTarget(); break; - case com.android.internal.R.id.aerr_reset: - mHandler.obtainMessage(RESET).sendToTarget(); - break; case com.android.internal.R.id.aerr_report: mHandler.obtainMessage(FORCE_QUIT_AND_REPORT).sendToTarget(); break; @@ -180,6 +200,15 @@ final class AppErrorDialog extends BaseErrorDialog implements View.OnClickListen } } + private final BroadcastReceiver mReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + if (Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(intent.getAction())) { + cancel(); + } + } + }; + static class Data { AppErrorResult result; TaskRecord task; diff --git a/services/core/java/com/android/server/am/AppErrors.java b/services/core/java/com/android/server/am/AppErrors.java index 3ed996992e2e..49106f42044e 100644 --- a/services/core/java/com/android/server/am/AppErrors.java +++ b/services/core/java/com/android/server/am/AppErrors.java @@ -370,38 +370,9 @@ class AppErrors { Intent appErrorIntent = null; MetricsLogger.action(mContext, MetricsProto.MetricsEvent.ACTION_APP_CRASH, res); - if (res == AppErrorDialog.TIMEOUT) { + if (res == AppErrorDialog.TIMEOUT || res == AppErrorDialog.CANCEL) { res = AppErrorDialog.FORCE_QUIT; } - if (res == AppErrorDialog.RESET) { - String[] packageList = r.getPackageList(); - if (packageList != null) { - PackageManager pm = mContext.getPackageManager(); - final Semaphore s = new Semaphore(0); - for (int i = 0; i < packageList.length; i++) { - if (i < packageList.length - 1) { - pm.deleteApplicationCacheFiles(packageList[i], null); - } else { - pm.deleteApplicationCacheFiles(packageList[i], - new IPackageDataObserver.Stub() { - @Override - public void onRemoveCompleted(String packageName, - boolean succeeded) { - s.release(); - } - }); - - // Wait until cache has been cleared before we restart. - try { - s.acquire(); - } catch (InterruptedException e) { - } - } - } - } - // If there was nothing to reset, just restart; - res = AppErrorDialog.RESTART; - } synchronized (mService) { if (res == AppErrorDialog.MUTE) { stopReportingCrashesLocked(r); diff --git a/services/core/java/com/android/server/am/LockTaskNotify.java b/services/core/java/com/android/server/am/LockTaskNotify.java index afde3226e933..8c18c462e956 100644 --- a/services/core/java/com/android/server/am/LockTaskNotify.java +++ b/services/core/java/com/android/server/am/LockTaskNotify.java @@ -21,7 +21,6 @@ import android.content.Context; import android.os.Handler; import android.os.Message; import android.view.WindowManager; -import android.view.accessibility.AccessibilityManager; import android.widget.Toast; import com.android.internal.R; @@ -35,13 +34,10 @@ public class LockTaskNotify { private final Context mContext; private final H mHandler; - private AccessibilityManager mAccessibilityManager; private Toast mLastToast; public LockTaskNotify(Context context) { mContext = context; - mAccessibilityManager = (AccessibilityManager) - mContext.getSystemService(Context.ACCESSIBILITY_SERVICE); mHandler = new H(); } @@ -54,8 +50,7 @@ public class LockTaskNotify { if (lockTaskModeState == ActivityManager.LOCK_TASK_MODE_LOCKED) { text = mContext.getString(R.string.lock_to_app_toast_locked); } else if (lockTaskModeState == ActivityManager.LOCK_TASK_MODE_PINNED) { - text = mContext.getString(mAccessibilityManager.isEnabled() - ? R.string.lock_to_app_toast_accessible : R.string.lock_to_app_toast); + text = mContext.getString(R.string.lock_to_app_toast); } if (text == null) { return; diff --git a/services/core/java/com/android/server/am/PendingIntentRecord.java b/services/core/java/com/android/server/am/PendingIntentRecord.java index 1f8d26bc55d0..c1ff4dd0e4a3 100644 --- a/services/core/java/com/android/server/am/PendingIntentRecord.java +++ b/services/core/java/com/android/server/am/PendingIntentRecord.java @@ -47,6 +47,7 @@ final class PendingIntentRecord extends IIntentSender.Stub { final WeakReference<PendingIntentRecord> ref; boolean sent = false; boolean canceled = false; + private long whitelistDuration = 0; String stringName; String lastTagPrefix; @@ -66,9 +67,9 @@ final class PendingIntentRecord extends IIntentSender.Stub { final int flags; final int hashCode; final int userId; - + private static final int ODD_PRIME_NUMBER = 37; - + Key(int _t, String _p, ActivityRecord _a, String _w, int _r, Intent[] _i, String[] _it, int _f, Bundle _o, int _userId) { type = _t; @@ -106,7 +107,7 @@ final class PendingIntentRecord extends IIntentSender.Stub { //Slog.i(ActivityManagerService.TAG, this + " hashCode=0x" // + Integer.toHexString(hashCode)); } - + public boolean equals(Object otherObj) { if (otherObj == null) { return false; @@ -198,6 +199,11 @@ final class PendingIntentRecord extends IIntentSender.Stub { ref = new WeakReference<PendingIntentRecord>(this); } + void setWhitelistDuration(long duration) { + this.whitelistDuration = duration; + this.stringName = null; + } + public void send(int code, Intent intent, String resolvedType, IIntentReceiver finishedReceiver, String requiredPermission, Bundle options) { sendInner(code, intent, resolvedType, finishedReceiver, @@ -216,6 +222,14 @@ final class PendingIntentRecord extends IIntentSender.Stub { if (intent != null) intent.setDefusable(true); if (options != null) options.setDefusable(true); + if (whitelistDuration > 0 && !canceled) { + // Must call before acquiring the lock. It's possible the method return before sending + // the intent due to some validations inside the lock, in which case the UID shouldn't + // be whitelisted, but since the whitelist is temporary, that would be ok. + owner.tempWhitelistAppForPowerSave(Binder.getCallingPid(), Binder.getCallingUid(), uid, + whitelistDuration); + } + synchronized (owner) { final ActivityContainer activityContainer = (ActivityContainer)container; if (activityContainer != null && activityContainer.mParentActivity != null && @@ -361,7 +375,7 @@ final class PendingIntentRecord extends IIntentSender.Stub { } } } - + void dump(PrintWriter pw, String prefix) { pw.print(prefix); pw.print("uid="); pw.print(uid); pw.print(" packageName="); pw.print(key.packageName); @@ -383,6 +397,7 @@ final class PendingIntentRecord extends IIntentSender.Stub { pw.print(prefix); pw.print("sent="); pw.print(sent); pw.print(" canceled="); pw.println(canceled); } + pw.print(prefix); pw.println("whitelistDuration="); pw.println(whitelistDuration); } public String toString() { @@ -396,6 +411,9 @@ final class PendingIntentRecord extends IIntentSender.Stub { sb.append(key.packageName); sb.append(' '); sb.append(key.typeName()); + if (whitelistDuration > 0) { + sb.append( " (whitelistDuration: ").append(whitelistDuration).append("ms)"); + } sb.append('}'); return stringName = sb.toString(); } diff --git a/services/core/java/com/android/server/am/ProcessRecord.java b/services/core/java/com/android/server/am/ProcessRecord.java index da18f32787bd..691fd2abe0b3 100644 --- a/services/core/java/com/android/server/am/ProcessRecord.java +++ b/services/core/java/com/android/server/am/ProcessRecord.java @@ -194,6 +194,8 @@ final class ProcessRecord { // Process is currently hosting a backup agent for backup or restore public boolean inFullBackup; + // App is allowed to manage whitelists such as temporary Power Save mode whitelist. + boolean whitelistManager; void dump(PrintWriter pw, String prefix) { final long now = SystemClock.uptimeMillis(); @@ -376,6 +378,9 @@ final class ProcessRecord { } pw.println(); } + if (whitelistManager) { + pw.print(prefix); pw.print("whitelistManager="); pw.println(whitelistManager); + } if (activities.size() > 0) { pw.print(prefix); pw.println("Activities:"); for (int i=0; i<activities.size(); i++) { diff --git a/services/core/java/com/android/server/am/TaskRecord.java b/services/core/java/com/android/server/am/TaskRecord.java index 8e9af40ba924..8932e4bbafc4 100644 --- a/services/core/java/com/android/server/am/TaskRecord.java +++ b/services/core/java/com/android/server/am/TaskRecord.java @@ -73,6 +73,8 @@ import static android.content.pm.ActivityInfo.LOCK_TASK_LAUNCH_MODE_NEVER; import static android.content.pm.ActivityInfo.RESIZE_MODE_CROP_WINDOWS; import static android.content.pm.ActivityInfo.RESIZE_MODE_FORCE_RESIZEABLE; import static android.content.pm.ApplicationInfo.PRIVATE_FLAG_PRIVILEGED; +import static android.content.res.Configuration.SCREENLAYOUT_LONG_MASK; +import static android.content.res.Configuration.SCREENLAYOUT_SIZE_MASK; import static android.provider.Settings.Secure.USER_SETUP_COMPLETE; import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_ADD_REMOVE; import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_LOCKTASK; @@ -490,10 +492,10 @@ final class TaskRecord { } /** - * Return true if the input activity has the same intent resolution as the intent this task + * Return true if the input activity has the same intent filter as the intent this task * record is based on (normally the root activity intent). */ - boolean isSameIntentResolution(ActivityRecord r) { + boolean isSameIntentFilter(ActivityRecord r) { final Intent intent = new Intent(r.intent); // Correct the activity intent for aliasing. The task record intent will always be based on // the real activity that will be launched not the alias, so we need to use an intent with @@ -1574,6 +1576,29 @@ final class TaskRecord { return bounds; } + /** + * Update fields that are not overridden for task from global configuration. + * + * @param globalConfig global configuration to update from. + */ + void sanitizeOverrideConfiguration(Configuration globalConfig) { + // If it's fullscreen, the override config should be empty and we should leave it alone. + if (mFullscreen) { + return; + } + + // screenLayout field is set in #calculateOverrideConfig but only part of it is really + // overridden - aspect ratio and size. Other flags (like layout direction) can be updated + // separately in global config and they also must be updated in override config. + int overrideScreenLayout = mOverrideConfig.screenLayout; + int newScreenLayout = globalConfig.screenLayout; + newScreenLayout = (newScreenLayout & ~SCREENLAYOUT_LONG_MASK) + | (overrideScreenLayout & SCREENLAYOUT_LONG_MASK); + newScreenLayout = (newScreenLayout & ~SCREENLAYOUT_SIZE_MASK) + | (overrideScreenLayout & SCREENLAYOUT_SIZE_MASK); + mOverrideConfig.screenLayout = newScreenLayout; + } + static Rect validateBounds(Rect bounds) { if (bounds != null && bounds.isEmpty()) { Slog.wtf(TAG, "Received strange task bounds: " + bounds, new Throwable()); diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java index 67f96d888e3b..f6232fe5222b 100644 --- a/services/core/java/com/android/server/am/UserController.java +++ b/services/core/java/com/android/server/am/UserController.java @@ -18,7 +18,6 @@ package com.android.server.am; import static android.Manifest.permission.INTERACT_ACROSS_USERS; import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL; -import static android.app.ActivityManager.FLAG_AND_UNLOCKING_OR_UNLOCKED; import static android.app.ActivityManager.USER_OP_ERROR_IS_SYSTEM; import static android.app.ActivityManager.USER_OP_ERROR_RELATED_USERS_CANNOT_STOP; import static android.app.ActivityManager.USER_OP_IS_CURRENT; @@ -233,6 +232,7 @@ final class UserController { // but we might immediately step into RUNNING below if the user // storage is already unlocked. if (uss.setState(STATE_BOOTING, STATE_RUNNING_LOCKED)) { + getUserManagerInternal().setUserState(userId, uss.state); Intent intent = new Intent(Intent.ACTION_LOCKED_BOOT_COMPLETED, null); intent.putExtra(Intent.EXTRA_USER_HANDLE, userId); intent.addFlags(Intent.FLAG_RECEIVER_NO_ABORT @@ -276,7 +276,7 @@ final class UserController { if (!StorageManager.isUserKeyUnlocked(userId)) return; if (uss.setState(STATE_RUNNING_LOCKED, STATE_RUNNING_UNLOCKING)) { - getUserManagerInternal().setUserUnlockingOrUnlocked(userId, true); + getUserManagerInternal().setUserState(userId, uss.state); uss.mUnlockProgress.start(); // Prepare app storage before we go any further @@ -307,7 +307,7 @@ final class UserController { if (!StorageManager.isUserKeyUnlocked(userId)) return; if (uss.setState(STATE_RUNNING_UNLOCKING, STATE_RUNNING_UNLOCKED)) { - getUserManagerInternal().setUserUnlockingOrUnlocked(userId, true); + getUserManagerInternal().setUserState(userId, uss.state); uss.mUnlockProgress.finish(); // Dispatch unlocked to external apps @@ -481,7 +481,7 @@ final class UserController { if (uss.state != UserState.STATE_STOPPING && uss.state != UserState.STATE_SHUTDOWN) { uss.setState(UserState.STATE_STOPPING); - getUserManagerInternal().setUserUnlockingOrUnlocked(userId, false); + getUserManagerInternal().setUserState(userId, uss.state); updateStartedUserArrayLocked(); long ident = Binder.clearCallingIdentity(); @@ -543,7 +543,7 @@ final class UserController { } uss.setState(UserState.STATE_SHUTDOWN); } - getUserManagerInternal().setUserUnlockingOrUnlocked(userId, false); + getUserManagerInternal().setUserState(userId, uss.state); mService.mBatteryStatsService.noteEvent( BatteryStats.HistoryItem.EVENT_USER_RUNNING_FINISH, @@ -572,6 +572,7 @@ final class UserController { stopped = true; // User can no longer run. mStartedUsers.remove(userId); + getUserManagerInternal().removeUserState(userId); mUserLru.remove(Integer.valueOf(userId)); updateStartedUserArrayLocked(); @@ -779,7 +780,9 @@ final class UserController { // If the user we are switching to is not currently started, then // we need to start it now. if (mStartedUsers.get(userId) == null) { - mStartedUsers.put(userId, new UserState(UserHandle.of(userId))); + UserState userState = new UserState(UserHandle.of(userId)); + mStartedUsers.put(userId, userState); + getUserManagerInternal().setUserState(userId, userState.state); updateStartedUserArrayLocked(); needStart = true; } @@ -813,15 +816,14 @@ final class UserController { // so we can just fairly silently bring the user back from // the almost-dead. uss.setState(uss.lastState); - if (isUserRunningLocked(userId, FLAG_AND_UNLOCKING_OR_UNLOCKED)) { - getUserManagerInternal().setUserUnlockingOrUnlocked(userId, true); - } + getUserManagerInternal().setUserState(userId, uss.state); updateStartedUserArrayLocked(); needStart = true; } else if (uss.state == UserState.STATE_SHUTDOWN) { // This means ACTION_SHUTDOWN has been sent, so we will // need to treat this as a new boot of the user. uss.setState(UserState.STATE_BOOTING); + getUserManagerInternal().setUserState(userId, uss.state); updateStartedUserArrayLocked(); needStart = true; } diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java index 32b9429ae656..1bdb48a23d9d 100644 --- a/services/core/java/com/android/server/connectivity/Vpn.java +++ b/services/core/java/com/android/server/connectivity/Vpn.java @@ -262,18 +262,37 @@ public class Vpn { * It uses {@link VpnConfig#LEGACY_VPN} as its package name, and * it can be revoked by itself. * - * @param oldPackage The package name of the old VPN application. - * @param newPackage The package name of the new VPN application. + * Note: when we added VPN pre-consent in http://ag/522961 the names oldPackage + * and newPackage become misleading, because when an app is pre-consented, we + * actually prepare oldPackage, not newPackage. + * + * Their meanings actually are: + * + * - oldPackage non-null, newPackage null: App calling VpnService#prepare(). + * - oldPackage null, newPackage non-null: ConfirmDialog calling prepareVpn(). + * - oldPackage non-null, newPackage=LEGACY_VPN: Used internally to disconnect + * and revoke any current app VPN and re-prepare legacy vpn. + * + * TODO: Rename the variables - or split this method into two - and end this + * confusion. + * + * @param oldPackage The package name of the old VPN application + * @param newPackage The package name of the new VPN application + * * @return true if the operation is succeeded. */ public synchronized boolean prepare(String oldPackage, String newPackage) { - // Stop an existing always-on VPN from being dethroned by other apps. - if (mAlwaysOn && !TextUtils.equals(mPackage, newPackage)) { - return false; - } - if (oldPackage != null) { - if (getAppUid(oldPackage, mUserHandle) != mOwnerUID) { + // Stop an existing always-on VPN from being dethroned by other apps. + // TODO: Replace TextUtils.equals by isCurrentPreparedPackage when ConnectivityService + // can unset always-on after always-on package is uninstalled. Make sure when package + // is reinstalled, the consent dialog is not shown. + if (mAlwaysOn && !TextUtils.equals(mPackage, oldPackage)) { + return false; + } + + // Package is not same or old package was reinstalled. + if (!isCurrentPreparedPackage(oldPackage)) { // The package doesn't match. We return false (to obtain user consent) unless the // user has already consented to that VPN package. if (!oldPackage.equals(VpnConfig.LEGACY_VPN) && isVpnUserPreConsented(oldPackage)) { @@ -291,17 +310,30 @@ public class Vpn { // Return true if we do not need to revoke. if (newPackage == null || (!newPackage.equals(VpnConfig.LEGACY_VPN) && - getAppUid(newPackage, mUserHandle) == mOwnerUID)) { + isCurrentPreparedPackage(newPackage))) { return true; } // Check that the caller is authorized. enforceControlPermission(); + // Stop an existing always-on VPN from being dethroned by other apps. + // TODO: Replace TextUtils.equals by isCurrentPreparedPackage when ConnectivityService + // can unset always-on after always-on package is uninstalled + if (mAlwaysOn && !TextUtils.equals(mPackage, newPackage)) { + return false; + } + prepareInternal(newPackage); return true; } + private boolean isCurrentPreparedPackage(String packageName) { + // We can't just check that packageName matches mPackage, because if the app was uninstalled + // and reinstalled it will no longer be prepared. Instead check the UID. + return getAppUid(packageName, mUserHandle) == mOwnerUID; + } + /** Prepare the VPN for the given package. Does not perform permission checks. */ private void prepareInternal(String newPackage) { long token = Binder.clearCallingIdentity(); @@ -555,8 +587,7 @@ public class Vpn { try { // Restricted users are not allowed to create VPNs, they are tied to Owner UserInfo user = mgr.getUserInfo(mUserHandle); - if (user.isRestricted() || mgr.hasUserRestriction(UserManager.DISALLOW_CONFIG_VPN, - new UserHandle(mUserHandle))) { + if (user.isRestricted()) { throw new SecurityException("Restricted users cannot establish VPNs"); } @@ -1055,18 +1086,27 @@ public class Vpn { } /** - * @return {@code true} if the set of users blocked whilst waiting for VPN to connect includes - * the UID {@param uid}, {@code false} otherwise. + * @return {@code true} if {@param uid} is blocked by an always-on VPN. + * A UID is blocked if it's included in one of the mBlockedUsers ranges and the VPN is + * not connected, or if the VPN is connected but does not apply to the UID. * * @see #mBlockedUsers */ public synchronized boolean isBlockingUid(int uid) { - for (UidRange uidRange : mBlockedUsers) { - if (uidRange.contains(uid)) { - return true; + if (!mLockdown) { + return false; + } + + if (mNetworkInfo.isConnected()) { + return !appliesToUid(uid); + } else { + for (UidRange uidRange : mBlockedUsers) { + if (uidRange.contains(uid)) { + return true; + } } + return false; } - return false; } private native int jniCreate(int mtu); diff --git a/services/core/java/com/android/server/job/JobPackageTracker.java b/services/core/java/com/android/server/job/JobPackageTracker.java index eb5edd38d8a9..ba96b7494bba 100644 --- a/services/core/java/com/android/server/job/JobPackageTracker.java +++ b/services/core/java/com/android/server/job/JobPackageTracker.java @@ -105,6 +105,8 @@ public final class JobPackageTracker { final long mStartElapsedTime; final long mStartClockTime; long mSummedTime; + int mMaxTotalActive; + int mMaxFgActive; public DataSet(DataSet otherTimes) { mStartUptimeTime = otherTimes.mStartUptimeTime; @@ -257,6 +259,12 @@ public final class JobPackageTracker { } } } + if (mMaxTotalActive > out.mMaxTotalActive) { + out.mMaxTotalActive = mMaxTotalActive; + } + if (mMaxFgActive > out.mMaxFgActive) { + out.mMaxFgActive = mMaxFgActive; + } } void printDuration(PrintWriter pw, long period, long duration, int count, String suffix) { @@ -317,6 +325,9 @@ public final class JobPackageTracker { pw.println(); } } + pw.print(prefix); pw.print(" Max concurrency: "); + pw.print(mMaxTotalActive); pw.print(" total, "); + pw.print(mMaxFgActive); pw.println(" foreground"); } } @@ -366,6 +377,15 @@ public final class JobPackageTracker { addEvent(EVENT_STOP_JOB, job.getSourceUid(), job.getBatteryName()); } + public void noteConcurrency(int totalActive, int fgActive) { + if (totalActive > mCurDataSet.mMaxTotalActive) { + mCurDataSet.mMaxTotalActive = totalActive; + } + if (fgActive > mCurDataSet.mMaxFgActive) { + mCurDataSet.mMaxFgActive = fgActive; + } + } + public float getLoadFactor(JobStatus job) { final int uid = job.getSourceUid(); final String pkg = job.getSourcePackageName(); diff --git a/services/core/java/com/android/server/job/JobSchedulerService.java b/services/core/java/com/android/server/job/JobSchedulerService.java index 491ee18dc0f4..27b3aa2280c0 100644 --- a/services/core/java/com/android/server/job/JobSchedulerService.java +++ b/services/core/java/com/android/server/job/JobSchedulerService.java @@ -16,10 +16,15 @@ package com.android.server.job; +import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED; +import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER; + import java.io.FileDescriptor; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; import java.util.Iterator; import java.util.List; @@ -34,6 +39,7 @@ import android.app.job.JobService; import android.app.job.IJobScheduler; import android.content.BroadcastReceiver; import android.content.ComponentName; +import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; @@ -41,6 +47,8 @@ import android.content.pm.IPackageManager; import android.content.pm.PackageManager; import android.content.pm.ServiceInfo; import android.content.pm.PackageManager.NameNotFoundException; +import android.database.ContentObserver; +import android.net.Uri; import android.os.BatteryStats; import android.os.Binder; import android.os.Handler; @@ -53,6 +61,8 @@ import android.os.ResultReceiver; import android.os.ServiceManager; import android.os.SystemClock; import android.os.UserHandle; +import android.provider.Settings; +import android.util.KeyValueListParser; import android.util.Slog; import android.util.SparseArray; import android.util.SparseIntArray; @@ -94,17 +104,12 @@ public final class JobSchedulerService extends com.android.server.SystemService public static final boolean DEBUG = false; /** The maximum number of concurrent jobs we run at one time. */ - private static final int MAX_JOB_CONTEXTS_COUNT = 12; - /** The number of MAX_JOB_CONTEXTS_COUNT we reserve for the foreground app. */ - private static final int FG_JOB_CONTEXTS_COUNT = 4; + private static final int MAX_JOB_CONTEXTS_COUNT = 16; /** Enforce a per-app limit on scheduled jobs? */ private static final boolean ENFORCE_MAX_JOBS = true; /** The maximum number of jobs that we allow an unprivileged app to schedule */ private static final int MAX_JOBS_PER_APP = 100; - /** This is the job execution factor that is considered to be heavy use of the system. */ - private static final float HEAVY_USE_FACTOR = .9f; - /** This is the job execution factor that is considered to be moderate use of the system. */ - private static final float MODERATE_USE_FACTOR = .5f; + /** Global local for all job scheduler state. */ final Object mLock = new Object(); @@ -118,34 +123,6 @@ public final class JobSchedulerService extends com.android.server.SystemService static final int MSG_STOP_JOB = 2; static final int MSG_CHECK_JOB_GREEDY = 3; - // Policy constants - /** - * Minimum # of idle jobs that must be ready in order to force the JMS to schedule things - * early. - */ - static final int MIN_IDLE_COUNT = 1; - /** - * Minimum # of charging jobs that must be ready in order to force the JMS to schedule things - * early. - */ - static final int MIN_CHARGING_COUNT = 1; - /** - * Minimum # of connectivity jobs that must be ready in order to force the JMS to schedule - * things early. - */ - static final int MIN_CONNECTIVITY_COUNT = 1; // Run connectivity jobs as soon as ready. - /** - * Minimum # of content trigger jobs that must be ready in order to force the JMS to schedule - * things early. - */ - static final int MIN_CONTENT_COUNT = 1; - /** - * Minimum # of jobs (with no particular constraints) for which the JMS will be happy running - * some work early. - * This is correlated with the amount of batching we'll be able to do. - */ - static final int MIN_READY_JOBS_COUNT = 2; - /** * Track Services that have currently active or pending jobs. The index is provided by * {@link JobStatus#getServiceToken()} @@ -182,7 +159,7 @@ public final class JobSchedulerService extends com.android.server.SystemService * Current limit on the number of concurrent JobServiceContext entries we want to * keep actively running a job. */ - int mMaxActiveJobs = MAX_JOB_CONTEXTS_COUNT - FG_JOB_CONTEXTS_COUNT; + int mMaxActiveJobs = 1; /** * Which uids are currently in the foreground. @@ -208,6 +185,211 @@ public final class JobSchedulerService extends com.android.server.SystemService int[] mTmpAssignPreferredUidForContext = new int[MAX_JOB_CONTEXTS_COUNT]; /** + * All times are in milliseconds. These constants are kept synchronized with the system + * global Settings. Any access to this class or its fields should be done while + * holding the JobSchedulerService.mLock lock. + */ + private final class Constants extends ContentObserver { + // Key names stored in the settings value. + private static final String KEY_MIN_IDLE_COUNT = "min_idle_count"; + private static final String KEY_MIN_CHARGING_COUNT = "min_charging_count"; + private static final String KEY_MIN_CONNECTIVITY_COUNT = "min_connectivity_count"; + private static final String KEY_MIN_CONTENT_COUNT = "min_content_count"; + private static final String KEY_MIN_READY_JOBS_COUNT = "min_ready_jobs_count"; + private static final String KEY_HEAVY_USE_FACTOR = "heavy_use_factor"; + private static final String KEY_MODERATE_USE_FACTOR = "moderate_use_factor"; + private static final String KEY_FG_JOB_COUNT = "fg_job_count"; + private static final String KEY_BG_NORMAL_JOB_COUNT = "bg_normal_job_count"; + private static final String KEY_BG_MODERATE_JOB_COUNT = "bg_moderate_job_count"; + private static final String KEY_BG_LOW_JOB_COUNT = "bg_low_job_count"; + private static final String KEY_BG_CRITICAL_JOB_COUNT = "bg_critical_job_count"; + + private static final int DEFAULT_MIN_IDLE_COUNT = 1; + private static final int DEFAULT_MIN_CHARGING_COUNT = 1; + private static final int DEFAULT_MIN_CONNECTIVITY_COUNT = 1; + private static final int DEFAULT_MIN_CONTENT_COUNT = 1; + private static final int DEFAULT_MIN_READY_JOBS_COUNT = 1; + private static final float DEFAULT_HEAVY_USE_FACTOR = .9f; + private static final float DEFAULT_MODERATE_USE_FACTOR = .5f; + private static final int DEFAULT_FG_JOB_COUNT = 4; + private static final int DEFAULT_BG_NORMAL_JOB_COUNT = 6; + private static final int DEFAULT_BG_MODERATE_JOB_COUNT = 4; + private static final int DEFAULT_BG_LOW_JOB_COUNT = 2; + private static final int DEFAULT_BG_CRITICAL_JOB_COUNT = 1; + + /** + * Minimum # of idle jobs that must be ready in order to force the JMS to schedule things + * early. + */ + int MIN_IDLE_COUNT = DEFAULT_MIN_IDLE_COUNT; + /** + * Minimum # of charging jobs that must be ready in order to force the JMS to schedule + * things early. + */ + int MIN_CHARGING_COUNT = DEFAULT_MIN_CHARGING_COUNT; + /** + * Minimum # of connectivity jobs that must be ready in order to force the JMS to schedule + * things early. 1 == Run connectivity jobs as soon as ready. + */ + int MIN_CONNECTIVITY_COUNT = DEFAULT_MIN_CONNECTIVITY_COUNT; + /** + * Minimum # of content trigger jobs that must be ready in order to force the JMS to + * schedule things early. + */ + int MIN_CONTENT_COUNT = DEFAULT_MIN_CONTENT_COUNT; + /** + * Minimum # of jobs (with no particular constraints) for which the JMS will be happy + * running some work early. This (and thus the other min counts) is now set to 1, to + * prevent any batching at this level. Since we now do batching through doze, that is + * a much better mechanism. + */ + int MIN_READY_JOBS_COUNT = DEFAULT_MIN_READY_JOBS_COUNT; + /** + * This is the job execution factor that is considered to be heavy use of the system. + */ + float HEAVY_USE_FACTOR = DEFAULT_HEAVY_USE_FACTOR; + /** + * This is the job execution factor that is considered to be moderate use of the system. + */ + float MODERATE_USE_FACTOR = DEFAULT_MODERATE_USE_FACTOR; + /** + * The number of MAX_JOB_CONTEXTS_COUNT we reserve for the foreground app. + */ + int FG_JOB_COUNT = DEFAULT_FG_JOB_COUNT; + /** + * The maximum number of background jobs we allow when the system is in a normal + * memory state. + */ + int BG_NORMAL_JOB_COUNT = DEFAULT_BG_NORMAL_JOB_COUNT; + /** + * The maximum number of background jobs we allow when the system is in a moderate + * memory state. + */ + int BG_MODERATE_JOB_COUNT = DEFAULT_BG_MODERATE_JOB_COUNT; + /** + * The maximum number of background jobs we allow when the system is in a low + * memory state. + */ + int BG_LOW_JOB_COUNT = DEFAULT_BG_LOW_JOB_COUNT; + /** + * The maximum number of background jobs we allow when the system is in a critical + * memory state. + */ + int BG_CRITICAL_JOB_COUNT = DEFAULT_BG_CRITICAL_JOB_COUNT; + + private ContentResolver mResolver; + private final KeyValueListParser mParser = new KeyValueListParser(','); + + public Constants(Handler handler) { + super(handler); + } + + public void start(ContentResolver resolver) { + mResolver = resolver; + mResolver.registerContentObserver(Settings.Global.getUriFor( + Settings.Global.JOB_SCHEDULER_CONSTANTS), false, this); + updateConstants(); + } + + @Override + public void onChange(boolean selfChange, Uri uri) { + updateConstants(); + } + + private void updateConstants() { + synchronized (mLock) { + try { + mParser.setString(Settings.Global.getString(mResolver, + Settings.Global.ALARM_MANAGER_CONSTANTS)); + } catch (IllegalArgumentException e) { + // Failed to parse the settings string, log this and move on + // with defaults. + Slog.e(TAG, "Bad device idle settings", e); + } + + MIN_IDLE_COUNT = mParser.getInt(KEY_MIN_IDLE_COUNT, + DEFAULT_MIN_IDLE_COUNT); + MIN_CHARGING_COUNT = mParser.getInt(KEY_MIN_CHARGING_COUNT, + DEFAULT_MIN_CHARGING_COUNT); + MIN_CONNECTIVITY_COUNT = mParser.getInt(KEY_MIN_CONNECTIVITY_COUNT, + DEFAULT_MIN_CONNECTIVITY_COUNT); + MIN_CONTENT_COUNT = mParser.getInt(KEY_MIN_CONTENT_COUNT, + DEFAULT_MIN_CONTENT_COUNT); + MIN_READY_JOBS_COUNT = mParser.getInt(KEY_MIN_READY_JOBS_COUNT, + DEFAULT_MIN_READY_JOBS_COUNT); + HEAVY_USE_FACTOR = mParser.getFloat(KEY_HEAVY_USE_FACTOR, + DEFAULT_HEAVY_USE_FACTOR); + MODERATE_USE_FACTOR = mParser.getFloat(KEY_MODERATE_USE_FACTOR, + DEFAULT_MODERATE_USE_FACTOR); + FG_JOB_COUNT = mParser.getInt(KEY_FG_JOB_COUNT, + DEFAULT_FG_JOB_COUNT); + BG_NORMAL_JOB_COUNT = mParser.getInt(KEY_BG_NORMAL_JOB_COUNT, + DEFAULT_BG_NORMAL_JOB_COUNT); + if ((FG_JOB_COUNT+BG_NORMAL_JOB_COUNT) > MAX_JOB_CONTEXTS_COUNT) { + BG_NORMAL_JOB_COUNT = MAX_JOB_CONTEXTS_COUNT - FG_JOB_COUNT; + } + BG_MODERATE_JOB_COUNT = mParser.getInt(KEY_BG_MODERATE_JOB_COUNT, + DEFAULT_BG_MODERATE_JOB_COUNT); + if ((FG_JOB_COUNT+BG_MODERATE_JOB_COUNT) > MAX_JOB_CONTEXTS_COUNT) { + BG_MODERATE_JOB_COUNT = MAX_JOB_CONTEXTS_COUNT - FG_JOB_COUNT; + } + BG_LOW_JOB_COUNT = mParser.getInt(KEY_BG_LOW_JOB_COUNT, + DEFAULT_BG_LOW_JOB_COUNT); + if ((FG_JOB_COUNT+BG_LOW_JOB_COUNT) > MAX_JOB_CONTEXTS_COUNT) { + BG_LOW_JOB_COUNT = MAX_JOB_CONTEXTS_COUNT - FG_JOB_COUNT; + } + BG_CRITICAL_JOB_COUNT = mParser.getInt(KEY_BG_CRITICAL_JOB_COUNT, + DEFAULT_BG_CRITICAL_JOB_COUNT); + if ((FG_JOB_COUNT+BG_CRITICAL_JOB_COUNT) > MAX_JOB_CONTEXTS_COUNT) { + BG_CRITICAL_JOB_COUNT = MAX_JOB_CONTEXTS_COUNT - FG_JOB_COUNT; + } + } + } + + void dump(PrintWriter pw) { + pw.println(" Settings:"); + + pw.print(" "); pw.print(KEY_MIN_IDLE_COUNT); pw.print("="); + pw.print(MIN_IDLE_COUNT); pw.println(); + + pw.print(" "); pw.print(KEY_MIN_CHARGING_COUNT); pw.print("="); + pw.print(MIN_CHARGING_COUNT); pw.println(); + + pw.print(" "); pw.print(KEY_MIN_CONNECTIVITY_COUNT); pw.print("="); + pw.print(MIN_CONNECTIVITY_COUNT); pw.println(); + + pw.print(" "); pw.print(KEY_MIN_CONTENT_COUNT); pw.print("="); + pw.print(MIN_CONTENT_COUNT); pw.println(); + + pw.print(" "); pw.print(KEY_MIN_READY_JOBS_COUNT); pw.print("="); + pw.print(MIN_READY_JOBS_COUNT); pw.println(); + + pw.print(" "); pw.print(KEY_HEAVY_USE_FACTOR); pw.print("="); + pw.print(HEAVY_USE_FACTOR); pw.println(); + + pw.print(" "); pw.print(KEY_MODERATE_USE_FACTOR); pw.print("="); + pw.print(MODERATE_USE_FACTOR); pw.println(); + + pw.print(" "); pw.print(KEY_FG_JOB_COUNT); pw.print("="); + pw.print(FG_JOB_COUNT); pw.println(); + + pw.print(" "); pw.print(KEY_BG_NORMAL_JOB_COUNT); pw.print("="); + pw.print(BG_NORMAL_JOB_COUNT); pw.println(); + + pw.print(" "); pw.print(KEY_BG_MODERATE_JOB_COUNT); pw.print("="); + pw.print(BG_MODERATE_JOB_COUNT); pw.println(); + + pw.print(" "); pw.print(KEY_BG_LOW_JOB_COUNT); pw.print("="); + pw.print(BG_LOW_JOB_COUNT); pw.println(); + + pw.print(" "); pw.print(KEY_BG_CRITICAL_JOB_COUNT); pw.print("="); + pw.print(BG_CRITICAL_JOB_COUNT); pw.println(); + } + } + + final Constants mConstants; + + /** * Cleans up outstanding jobs when a package is removed. Even if it's being replaced later we * still clean up. On reinstall the package will have a new uid. */ @@ -217,7 +399,41 @@ public final class JobSchedulerService extends com.android.server.SystemService if (DEBUG) { Slog.d(TAG, "Receieved: " + intent.getAction()); } - if (Intent.ACTION_PACKAGE_REMOVED.equals(intent.getAction())) { + if (Intent.ACTION_PACKAGE_CHANGED.equals(intent.getAction())) { + // Purge the app's jobs if the whole package was just disabled. When this is + // the case the component name will be a bare package name. + final String pkgName = getPackageName(intent); + final int pkgUid = intent.getIntExtra(Intent.EXTRA_UID, -1); + if (pkgName != null && pkgUid != -1) { + final String[] changedComponents = intent.getStringArrayExtra( + Intent.EXTRA_CHANGED_COMPONENT_NAME_LIST); + if (changedComponents != null) { + for (String component : changedComponents) { + if (component.equals(pkgName)) { + if (DEBUG) { + Slog.d(TAG, "Package state change: " + pkgName); + } + try { + final int userId = UserHandle.getUserId(pkgUid); + IPackageManager pm = AppGlobals.getPackageManager(); + final int state = pm.getApplicationEnabledSetting(pkgName, userId); + if (state == COMPONENT_ENABLED_STATE_DISABLED + || state == COMPONENT_ENABLED_STATE_DISABLED_USER) { + if (DEBUG) { + Slog.d(TAG, "Removing jobs for package " + pkgName + + " in user " + userId); + } + cancelJobsForUid(pkgUid, true); + } + } catch (RemoteException e) { /* cannot happen */ } + break; + } + } + } + } else { + Slog.w(TAG, "PACKAGE_CHANGED for " + pkgName + " / uid " + pkgUid); + } + } else if (Intent.ACTION_PACKAGE_REMOVED.equals(intent.getAction())) { // If this is an outright uninstall rather than the first half of an // app update sequence, cancel the jobs associated with the app. if (!intent.getBooleanExtra(Intent.EXTRA_REPLACING, false)) { @@ -237,6 +453,12 @@ public final class JobSchedulerService extends com.android.server.SystemService } }; + private String getPackageName(Intent intent) { + Uri uri = intent.getData(); + String pkg = uri != null ? uri.getSchemeSpecificPart() : null; + return pkg; + } + final private IUidObserver mUidObserver = new IUidObserver.Stub() { @Override public void onUidStateChanged(int uid, int procState) throws RemoteException { updateUidState(uid, procState); @@ -440,11 +662,13 @@ public final class JobSchedulerService extends com.android.server.SystemService public void onDeviceIdleStateChanged(boolean deviceIdle) { synchronized (mLock) { if (deviceIdle) { - // When becoming idle, make sure no jobs are actively running. + // When becoming idle, make sure no jobs are actively running, + // except those using the idle exemption flag. for (int i=0; i<mActiveServices.size(); i++) { JobServiceContext jsc = mActiveServices.get(i); final JobStatus executing = jsc.getRunningJob(); - if (executing != null) { + if (executing != null + && (executing.getFlags() & JobInfo.FLAG_WILL_BE_FOREGROUND) == 0) { jsc.cancelExecutingJob(JobParameters.REASON_DEVICE_IDLE); } } @@ -495,6 +719,11 @@ public final class JobSchedulerService extends com.android.server.SystemService */ public JobSchedulerService(Context context) { super(context); + mHandler = new JobHandler(context.getMainLooper()); + mConstants = new Constants(mHandler); + mJobSchedulerStub = new JobSchedulerStub(); + mJobs = JobStore.initAndGet(this); + // Create the controllers. mControllers = new ArrayList<StateController>(); mControllers.add(ConnectivityController.get(this)); @@ -504,10 +733,6 @@ public final class JobSchedulerService extends com.android.server.SystemService mControllers.add(AppIdleController.get(this)); mControllers.add(ContentObserverController.get(this)); mControllers.add(DeviceIdleJobsController.get(this)); - - mHandler = new JobHandler(context.getMainLooper()); - mJobSchedulerStub = new JobSchedulerStub(); - mJobs = JobStore.initAndGet(this); } @Override @@ -519,8 +744,11 @@ public final class JobSchedulerService extends com.android.server.SystemService @Override public void onBootPhase(int phase) { if (PHASE_SYSTEM_SERVICES_READY == phase) { + mConstants.start(getContext().getContentResolver()); // Register br for package removals and user removals. - final IntentFilter filter = new IntentFilter(Intent.ACTION_PACKAGE_REMOVED); + final IntentFilter filter = new IntentFilter(); + filter.addAction(Intent.ACTION_PACKAGE_REMOVED); + filter.addAction(Intent.ACTION_PACKAGE_CHANGED); filter.addDataScheme("package"); getContext().registerReceiverAsUser( mBroadcastReceiver, UserHandle.ALL, filter, null, null); @@ -948,11 +1176,12 @@ public final class JobSchedulerService extends com.android.server.SystemService public void postProcess() { if (backoffCount > 0 || - idleCount >= MIN_IDLE_COUNT || - connectivityCount >= MIN_CONNECTIVITY_COUNT || - chargingCount >= MIN_CHARGING_COUNT || - contentCount >= MIN_CONTENT_COUNT || - (runnableJobs != null && runnableJobs.size() >= MIN_READY_JOBS_COUNT)) { + idleCount >= mConstants.MIN_IDLE_COUNT || + connectivityCount >= mConstants.MIN_CONNECTIVITY_COUNT || + chargingCount >= mConstants.MIN_CHARGING_COUNT || + contentCount >= mConstants.MIN_CONTENT_COUNT || + (runnableJobs != null + && runnableJobs.size() >= mConstants.MIN_READY_JOBS_COUNT)) { if (DEBUG) { Slog.d(TAG, "maybeQueueReadyJobsForExecutionLockedH: Running jobs."); } @@ -1049,9 +1278,9 @@ public final class JobSchedulerService extends com.android.server.SystemService private int adjustJobPriority(int curPriority, JobStatus job) { if (curPriority < JobInfo.PRIORITY_TOP_APP) { float factor = mJobPackageTracker.getLoadFactor(job); - if (factor >= HEAVY_USE_FACTOR) { + if (factor >= mConstants.HEAVY_USE_FACTOR) { curPriority += JobInfo.PRIORITY_ADJ_ALWAYS_RUNNING; - } else if (factor >= MODERATE_USE_FACTOR) { + } else if (factor >= mConstants.MODERATE_USE_FACTOR) { curPriority += JobInfo.PRIORITY_ADJ_OFTEN_RUNNING; } } @@ -1089,16 +1318,16 @@ public final class JobSchedulerService extends com.android.server.SystemService } switch (memLevel) { case ProcessStats.ADJ_MEM_FACTOR_MODERATE: - mMaxActiveJobs = ((MAX_JOB_CONTEXTS_COUNT - FG_JOB_CONTEXTS_COUNT) * 2) / 3; + mMaxActiveJobs = mConstants.BG_MODERATE_JOB_COUNT; break; case ProcessStats.ADJ_MEM_FACTOR_LOW: - mMaxActiveJobs = (MAX_JOB_CONTEXTS_COUNT - FG_JOB_CONTEXTS_COUNT) / 3; + mMaxActiveJobs = mConstants.BG_LOW_JOB_COUNT; break; case ProcessStats.ADJ_MEM_FACTOR_CRITICAL: - mMaxActiveJobs = 1; + mMaxActiveJobs = mConstants.BG_CRITICAL_JOB_COUNT; break; default: - mMaxActiveJobs = MAX_JOB_CONTEXTS_COUNT - FG_JOB_CONTEXTS_COUNT; + mMaxActiveJobs = mConstants.BG_NORMAL_JOB_COUNT; break; } @@ -1106,10 +1335,15 @@ public final class JobSchedulerService extends com.android.server.SystemService boolean[] act = mTmpAssignAct; int[] preferredUidForContext = mTmpAssignPreferredUidForContext; int numActive = 0; + int numForeground = 0; for (int i=0; i<MAX_JOB_CONTEXTS_COUNT; i++) { final JobServiceContext js = mActiveServices.get(i); - if ((contextIdToJobMap[i] = js.getRunningJob()) != null) { + final JobStatus status = js.getRunningJob(); + if ((contextIdToJobMap[i] = status) != null) { numActive++; + if (status.lastEvaluatedPriority >= JobInfo.PRIORITY_TOP_APP) { + numForeground++; + } } act[i] = false; preferredUidForContext[i] = js.getPreferredUid(); @@ -1138,13 +1372,14 @@ public final class JobSchedulerService extends com.android.server.SystemService JobStatus job = contextIdToJobMap[j]; int preferredUid = preferredUidForContext[j]; if (job == null) { - if ((numActive < mMaxActiveJobs || priority >= JobInfo.PRIORITY_TOP_APP) && + if ((numActive < mMaxActiveJobs || + (priority >= JobInfo.PRIORITY_TOP_APP && + numForeground < mConstants.FG_JOB_COUNT)) && (preferredUid == nextPending.getUid() || preferredUid == JobServiceContext.NO_PREFERRED_UID)) { // This slot is free, and we haven't yet hit the limit on // concurrent jobs... we can just throw the job in to here. minPriorityContextId = j; - numActive++; break; } // No job on this context, but nextPending can't run here because @@ -1166,11 +1401,16 @@ public final class JobSchedulerService extends com.android.server.SystemService if (minPriorityContextId != -1) { contextIdToJobMap[minPriorityContextId] = nextPending; act[minPriorityContextId] = true; + numActive++; + if (priority >= JobInfo.PRIORITY_TOP_APP) { + numForeground++; + } } } if (DEBUG) { Slog.d(TAG, printContextIdToJobMap(contextIdToJobMap, "running jobs final")); } + mJobPackageTracker.noteConcurrency(numActive, numForeground); for (int i=0; i<MAX_JOB_CONTEXTS_COUNT; i++) { boolean preservePreferredUid = false; if (act[i]) { @@ -1523,36 +1763,49 @@ public final class JobSchedulerService extends com.android.server.SystemService final int filterUidFinal = UserHandle.getAppId(filterUid); final long now = SystemClock.elapsedRealtime(); synchronized (mLock) { + mConstants.dump(pw); + pw.println(); pw.println("Started users: " + Arrays.toString(mStartedUsers)); - pw.println("Registered jobs:"); + pw.print("Registered "); + pw.print(mJobs.size()); + pw.println(" jobs:"); if (mJobs.size() > 0) { - mJobs.forEachJob(new JobStatusFunctor() { - private int index = 0; - + final List<JobStatus> jobs = mJobs.mJobSet.getAllJobs(); + Collections.sort(jobs, new Comparator<JobStatus>() { @Override - public void process(JobStatus job) { - pw.print(" Job #"); pw.print(index++); pw.print(": "); - pw.println(job.toShortString()); - - // Skip printing details if the caller requested a filter - if (!job.shouldDump(filterUidFinal)) { - return; + public int compare(JobStatus o1, JobStatus o2) { + int uid1 = o1.getUid(); + int uid2 = o2.getUid(); + int id1 = o1.getJobId(); + int id2 = o2.getJobId(); + if (uid1 != uid2) { + return uid1 < uid2 ? -1 : 1; } - - job.dump(pw, " ", true); - pw.print(" Ready: "); - pw.print(mHandler.isReadyToBeExecutedLocked(job)); - pw.print(" (job="); - pw.print(job.isReady()); - pw.print(" pending="); - pw.print(mPendingJobs.contains(job)); - pw.print(" active="); - pw.print(isCurrentlyActiveLocked(job)); - pw.print(" user="); - pw.print(ArrayUtils.contains(mStartedUsers, job.getUserId())); - pw.println(")"); + return id1 < id2 ? -1 : (id1 > id2 ? 1 : 0); } }); + for (JobStatus job : jobs) { + pw.print(" JOB #"); job.printUniqueId(pw); pw.print(": "); + pw.println(job.toShortStringExceptUniqueId()); + + // Skip printing details if the caller requested a filter + if (!job.shouldDump(filterUidFinal)) { + continue; + } + + job.dump(pw, " ", true); + pw.print(" Ready: "); + pw.print(mHandler.isReadyToBeExecutedLocked(job)); + pw.print(" (job="); + pw.print(job.isReady()); + pw.print(" pending="); + pw.print(mPendingJobs.contains(job)); + pw.print(" active="); + pw.print(isCurrentlyActiveLocked(job)); + pw.print(" user="); + pw.print(ArrayUtils.contains(mStartedUsers, job.getUserId())); + pw.println(")"); + } } else { pw.println(" None."); } diff --git a/services/core/java/com/android/server/job/JobServiceContext.java b/services/core/java/com/android/server/job/JobServiceContext.java index 4fd1350b5d1a..31528e509012 100644 --- a/services/core/java/com/android/server/job/JobServiceContext.java +++ b/services/core/java/com/android/server/job/JobServiceContext.java @@ -223,10 +223,11 @@ public class JobServiceContext extends IJobCallback.Stub implements ServiceConne * stop executing. */ JobStatus getRunningJob() { + final JobStatus job; synchronized (mLock) { - return mRunningJob == null ? - null : new JobStatus(mRunningJob); + job = mRunningJob; } + return job == null ? null : new JobStatus(job); } /** Called externally when a job that was scheduled for execution should be cancelled. */ diff --git a/services/core/java/com/android/server/job/JobStore.java b/services/core/java/com/android/server/job/JobStore.java index 1f7d3128d655..602b9c755e88 100644 --- a/services/core/java/com/android/server/job/JobStore.java +++ b/services/core/java/com/android/server/job/JobStore.java @@ -844,8 +844,16 @@ public class JobStore { // Inefficient; use only for testing public List<JobStatus> getAllJobs() { ArrayList<JobStatus> allJobs = new ArrayList<JobStatus>(size()); - for (int i = mJobs.size(); i >= 0; i--) { - allJobs.addAll(mJobs.valueAt(i)); + for (int i = mJobs.size() - 1; i >= 0; i--) { + ArraySet<JobStatus> jobs = mJobs.valueAt(i); + if (jobs != null) { + // Use a for loop over the ArraySet, so we don't need to make its + // optional collection class iterator implementation or have to go + // through a temporary array from toArray(). + for (int j = jobs.size() - 1; j >= 0; j--) { + allJobs.add(jobs.valueAt(j)); + } + } } return allJobs; } diff --git a/services/core/java/com/android/server/job/controllers/AppIdleController.java b/services/core/java/com/android/server/job/controllers/AppIdleController.java index 759303542aec..a23af3541e19 100644 --- a/services/core/java/com/android/server/job/controllers/AppIdleController.java +++ b/services/core/java/com/android/server/job/controllers/AppIdleController.java @@ -18,6 +18,7 @@ package com.android.server.job.controllers; import android.app.usage.UsageStatsManagerInternal; import android.content.Context; +import android.os.UserHandle; import android.util.Slog; import com.android.server.LocalServices; @@ -42,6 +43,7 @@ public class AppIdleController extends StateController { private static volatile AppIdleController sController; private final JobSchedulerService mJobSchedulerService; private final UsageStatsManagerInternal mUsageStatsInternal; + private boolean mInitializedParoleOn; boolean mAppIdleParoleOn; final class GlobalUpdateFunc implements JobStore.JobStatusFunctor { @@ -100,12 +102,16 @@ public class AppIdleController extends StateController { super(service, context, lock); mJobSchedulerService = service; mUsageStatsInternal = LocalServices.getService(UsageStatsManagerInternal.class); - mAppIdleParoleOn = mUsageStatsInternal.isAppIdleParoleOn(); + mAppIdleParoleOn = true; mUsageStatsInternal.addAppIdleStateChangeListener(new AppIdleStateChangeListener()); } @Override public void maybeStartTrackingJobLocked(JobStatus jobStatus, JobStatus lastJob) { + if (!mInitializedParoleOn) { + mInitializedParoleOn = true; + mAppIdleParoleOn = mUsageStatsInternal.isAppIdleParoleOn(); + } String packageName = jobStatus.getSourcePackageName(); final boolean appIdle = !mAppIdleParoleOn && mUsageStatsInternal.isAppIdle(packageName, jobStatus.getSourceUid(), jobStatus.getSourceUserId()); @@ -122,21 +128,24 @@ public class AppIdleController extends StateController { @Override public void dumpControllerStateLocked(final PrintWriter pw, final int filterUid) { - pw.println("AppIdle"); - pw.println("Parole On: " + mAppIdleParoleOn); + pw.print("AppIdle: parole on = "); + pw.println(mAppIdleParoleOn); mJobSchedulerService.getJobStore().forEachJob(new JobStore.JobStatusFunctor() { @Override public void process(JobStatus jobStatus) { // Skip printing details if the caller requested a filter if (!jobStatus.shouldDump(filterUid)) { return; } - pw.print(" "); + pw.print(" #"); + jobStatus.printUniqueId(pw); + pw.print(" from "); + UserHandle.formatUid(pw, jobStatus.getSourceUid()); + pw.print(": "); pw.print(jobStatus.getSourcePackageName()); - pw.print(": runnable="); + pw.print(", runnable="); pw.println((jobStatus.satisfiedConstraints&JobStatus.CONSTRAINT_APP_NOT_IDLE) != 0); } }); - pw.println(); } void setAppIdleParoleOn(boolean isAppIdleParoleOn) { diff --git a/services/core/java/com/android/server/job/controllers/BatteryController.java b/services/core/java/com/android/server/job/controllers/BatteryController.java index a0cb25fb6870..f6b8ef4387b8 100644 --- a/services/core/java/com/android/server/job/controllers/BatteryController.java +++ b/services/core/java/com/android/server/job/controllers/BatteryController.java @@ -23,6 +23,7 @@ import android.content.IntentFilter; import android.os.BatteryManager; import android.os.BatteryManagerInternal; import android.os.SystemClock; +import android.os.UserHandle; import android.util.Slog; import com.android.internal.annotations.VisibleForTesting; @@ -195,21 +196,21 @@ public class BatteryController extends StateController { @Override public void dumpControllerStateLocked(PrintWriter pw, int filterUid) { - pw.println("Batt."); - pw.println("Stable power: " + mChargeTracker.isOnStablePower()); - Iterator<JobStatus> it = mTrackedTasks.iterator(); - if (it.hasNext()) { - JobStatus jobStatus = it.next(); - if (jobStatus.shouldDump(filterUid)) { - pw.print(String.valueOf(jobStatus.hashCode())); + pw.print("Battery: stable power = "); + pw.println(mChargeTracker.isOnStablePower()); + pw.print("Tracking "); + pw.print(mTrackedTasks.size()); + pw.println(":"); + for (int i = 0; i < mTrackedTasks.size(); i++) { + final JobStatus js = mTrackedTasks.get(i); + if (!js.shouldDump(filterUid)) { + continue; } + pw.print(" #"); + js.printUniqueId(pw); + pw.print(" from "); + UserHandle.formatUid(pw, js.getSourceUid()); + pw.println(); } - while (it.hasNext()) { - JobStatus jobStatus = it.next(); - if (jobStatus.shouldDump(filterUid)) { - pw.print("," + String.valueOf(jobStatus.hashCode())); - } - } - pw.println(); } } diff --git a/services/core/java/com/android/server/job/controllers/ConnectivityController.java b/services/core/java/com/android/server/job/controllers/ConnectivityController.java index 7d28633104cd..2ff880c5f19c 100644 --- a/services/core/java/com/android/server/job/controllers/ConnectivityController.java +++ b/services/core/java/com/android/server/job/controllers/ConnectivityController.java @@ -187,14 +187,20 @@ public class ConnectivityController extends StateController implements @Override public void dumpControllerStateLocked(PrintWriter pw, int filterUid) { - pw.println("Conn."); + pw.println("Connectivity."); + pw.print("Tracking "); + pw.print(mTrackedJobs.size()); + pw.println(":"); for (int i = 0; i < mTrackedJobs.size(); i++) { final JobStatus js = mTrackedJobs.get(i); if (js.shouldDump(filterUid)) { - pw.println(String.valueOf(js.getJobId() + "," + js.getUid()) - + ": C=" + js.hasConnectivityConstraint() - + ", UM=" + js.hasUnmeteredConstraint() - + ", NR=" + js.hasNotRoamingConstraint()); + pw.print(" #"); + js.printUniqueId(pw); + pw.print(" from "); + UserHandle.formatUid(pw, js.getSourceUid()); + pw.print(": C="); pw.print(js.hasConnectivityConstraint()); + pw.print(": UM="); pw.print(js.hasUnmeteredConstraint()); + pw.print(": NR="); pw.println(js.hasNotRoamingConstraint()); } } } diff --git a/services/core/java/com/android/server/job/controllers/ContentObserverController.java b/services/core/java/com/android/server/job/controllers/ContentObserverController.java index c1d7c5826a4f..26660e82e841 100644 --- a/services/core/java/com/android/server/job/controllers/ContentObserverController.java +++ b/services/core/java/com/android/server/job/controllers/ContentObserverController.java @@ -21,6 +21,7 @@ import android.content.Context; import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; +import android.os.UserHandle; import android.util.TimeUtils; import android.util.ArrayMap; import android.util.ArraySet; @@ -323,23 +324,17 @@ public class ContentObserverController extends StateController { @Override public void dumpControllerStateLocked(PrintWriter pw, int filterUid) { - pw.println("Content."); - boolean printed = false; + pw.println("Content:"); Iterator<JobStatus> it = mTrackedTasks.iterator(); while (it.hasNext()) { JobStatus js = it.next(); if (!js.shouldDump(filterUid)) { continue; } - if (!printed) { - pw.print(" "); - printed = true; - } else { - pw.print(","); - } - pw.print(System.identityHashCode(js)); - } - if (printed) { + pw.print(" #"); + js.printUniqueId(pw); + pw.print(" from "); + UserHandle.formatUid(pw, js.getSourceUid()); pw.println(); } int N = mObservers.size(); @@ -367,8 +362,10 @@ public class ContentObserverController extends StateController { pw.println(" Jobs:"); for (int j=0; j<M; j++) { JobInstance inst = obs.mJobs.valueAt(j); - pw.print(" "); - pw.print(System.identityHashCode(inst.mJobStatus)); + pw.print(" #"); + inst.mJobStatus.printUniqueId(pw); + pw.print(" from "); + UserHandle.formatUid(pw, inst.mJobStatus.getSourceUid()); if (inst.mChangedAuthorities != null) { pw.println(":"); if (inst.mTriggerPending) { diff --git a/services/core/java/com/android/server/job/controllers/DeviceIdleJobsController.java b/services/core/java/com/android/server/job/controllers/DeviceIdleJobsController.java index 345a032497ef..bf1297faf183 100644 --- a/services/core/java/com/android/server/job/controllers/DeviceIdleJobsController.java +++ b/services/core/java/com/android/server/job/controllers/DeviceIdleJobsController.java @@ -180,13 +180,16 @@ public class DeviceIdleJobsController extends StateController { if (!jobStatus.shouldDump(filterUid)) { return; } - pw.print(" "); + pw.print(" #"); + jobStatus.printUniqueId(pw); + pw.print(" from "); + UserHandle.formatUid(pw, jobStatus.getSourceUid()); + pw.print(": "); pw.print(jobStatus.getSourcePackageName()); - pw.print(": runnable="); + pw.print(", runnable="); pw.println((jobStatus.satisfiedConstraints & JobStatus.CONSTRAINT_DEVICE_NOT_DOZING) != 0); } }); - pw.println(); } }
\ No newline at end of file diff --git a/services/core/java/com/android/server/job/controllers/IdleController.java b/services/core/java/com/android/server/job/controllers/IdleController.java index 5899d1647ad8..f41e1876e721 100644 --- a/services/core/java/com/android/server/job/controllers/IdleController.java +++ b/services/core/java/com/android/server/job/controllers/IdleController.java @@ -26,6 +26,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.SystemClock; +import android.os.UserHandle; import android.util.Slog; import com.android.server.am.ActivityManagerService; @@ -191,15 +192,19 @@ public class IdleController extends StateController { public void dumpControllerStateLocked(PrintWriter pw, int filterUid) { pw.print("Idle: "); pw.println(mIdleTracker.isIdle() ? "true" : "false"); - pw.println(mTrackedTasks.size()); + pw.print("Tracking "); + pw.print(mTrackedTasks.size()); + pw.println(":"); for (int i = 0; i < mTrackedTasks.size(); i++) { final JobStatus js = mTrackedTasks.get(i); if (!js.shouldDump(filterUid)) { continue; } - pw.print(" "); - pw.print(String.valueOf(js.getJobId() + "," + js.getUid())); - pw.println(".."); + pw.print(" #"); + js.printUniqueId(pw); + pw.print(" from "); + UserHandle.formatUid(pw, js.getSourceUid()); + pw.println(); } } } diff --git a/services/core/java/com/android/server/job/controllers/JobStatus.java b/services/core/java/com/android/server/job/controllers/JobStatus.java index 072787b19dc5..ded7a2f3521e 100644 --- a/services/core/java/com/android/server/job/controllers/JobStatus.java +++ b/services/core/java/com/android/server/job/controllers/JobStatus.java @@ -249,6 +249,12 @@ public final class JobStatus { return job.getId(); } + public void printUniqueId(PrintWriter pw) { + UserHandle.formatUid(pw, callingUid); + pw.print("/"); + pw.print(job.getId()); + } + public int getNumFailures() { return numFailures; } @@ -410,6 +416,10 @@ public final class JobStatus { return true; } + boolean isConstraintSatisfied(int constraint) { + return (satisfiedConstraints&constraint) != 0; + } + public boolean shouldDump(int filterUid) { return filterUid == -1 || UserHandle.getAppId(getUid()) == filterUid || UserHandle.getAppId(getSourceUid()) == filterUid; @@ -505,10 +515,22 @@ public final class JobStatus { public String toShortString() { StringBuilder sb = new StringBuilder(); sb.append(Integer.toHexString(System.identityHashCode(this))); - sb.append(" jId="); + sb.append(" #"); + UserHandle.formatUid(sb, callingUid); + sb.append("/"); sb.append(job.getId()); sb.append(' '); - UserHandle.formatUid(sb, callingUid); + sb.append(batteryName); + return sb.toString(); + } + + /** + * Convenience function to identify a job uniquely without pulling all the data that + * {@link #toString()} returns. + */ + public String toShortStringExceptUniqueId() { + StringBuilder sb = new StringBuilder(); + sb.append(Integer.toHexString(System.identityHashCode(this))); sb.append(' '); sb.append(batteryName); return sb.toString(); diff --git a/services/core/java/com/android/server/job/controllers/TimeController.java b/services/core/java/com/android/server/job/controllers/TimeController.java index 2f8ca7eb1f80..0b3b00fa84aa 100644 --- a/services/core/java/com/android/server/job/controllers/TimeController.java +++ b/services/core/java/com/android/server/job/controllers/TimeController.java @@ -20,7 +20,10 @@ import android.app.AlarmManager; import android.app.AlarmManager.OnAlarmListener; import android.content.Context; import android.os.SystemClock; +import android.os.UserHandle; +import android.os.WorkSource; import android.util.Slog; +import android.util.TimeUtils; import com.android.server.job.JobSchedulerService; import com.android.server.job.StateChangedListener; @@ -39,9 +42,9 @@ public class TimeController extends StateController { private static final String TAG = "JobScheduler.Time"; /** Deadline alarm tag for logging purposes */ - private final String DEADLINE_TAG = "JobScheduler.deadline"; + private final String DEADLINE_TAG = "*job.deadline*"; /** Delay alarm tag for logging purposes */ - private final String DELAY_TAG = "JobScheduler.delay"; + private final String DELAY_TAG = "*job.delay*"; private long mNextJobExpiredElapsedMillis; private long mNextDelayExpiredElapsedMillis; @@ -91,7 +94,8 @@ public class TimeController extends StateController { it.add(job); maybeUpdateAlarmsLocked( job.hasTimingDelayConstraint() ? job.getEarliestRunTime() : Long.MAX_VALUE, - job.hasDeadlineConstraint() ? job.getLatestRunTimeElapsed() : Long.MAX_VALUE); + job.hasDeadlineConstraint() ? job.getLatestRunTimeElapsed() : Long.MAX_VALUE, + job.getSourceUid()); } } @@ -134,6 +138,7 @@ public class TimeController extends StateController { private void checkExpiredDeadlinesAndResetAlarm() { synchronized (mLock) { long nextExpiryTime = Long.MAX_VALUE; + int nextExpiryUid = 0; final long nowElapsedMillis = SystemClock.elapsedRealtime(); Iterator<JobStatus> it = mTrackedJobs.iterator(); @@ -153,10 +158,11 @@ public class TimeController extends StateController { it.remove(); } else { // Sorted by expiry time, so take the next one and stop. nextExpiryTime = jobDeadline; + nextExpiryUid = job.getSourceUid(); break; } } - setDeadlineExpiredAlarmLocked(nextExpiryTime); + setDeadlineExpiredAlarmLocked(nextExpiryTime, nextExpiryUid); } } @@ -168,6 +174,7 @@ public class TimeController extends StateController { synchronized (mLock) { final long nowElapsedMillis = SystemClock.elapsedRealtime(); long nextDelayTime = Long.MAX_VALUE; + int nextDelayUid = 0; boolean ready = false; Iterator<JobStatus> it = mTrackedJobs.iterator(); while (it.hasNext()) { @@ -184,25 +191,29 @@ public class TimeController extends StateController { if (job.isReady()) { ready = true; } - } else { // Keep going through list to get next delay time. + } else if (!job.isConstraintSatisfied(JobStatus.CONSTRAINT_TIMING_DELAY)) { + // If this job still doesn't have its delay constraint satisfied, + // then see if it is the next upcoming delay time for the alarm. if (nextDelayTime > jobDelayTime) { nextDelayTime = jobDelayTime; + nextDelayUid = job.getSourceUid(); } } } if (ready) { mStateChangedListener.onControllerStateChanged(); } - setDelayExpiredAlarmLocked(nextDelayTime); + setDelayExpiredAlarmLocked(nextDelayTime, nextDelayUid); } } - private void maybeUpdateAlarmsLocked(long delayExpiredElapsed, long deadlineExpiredElapsed) { + private void maybeUpdateAlarmsLocked(long delayExpiredElapsed, long deadlineExpiredElapsed, + int uid) { if (delayExpiredElapsed < mNextDelayExpiredElapsedMillis) { - setDelayExpiredAlarmLocked(delayExpiredElapsed); + setDelayExpiredAlarmLocked(delayExpiredElapsed, uid); } if (deadlineExpiredElapsed < mNextJobExpiredElapsedMillis) { - setDeadlineExpiredAlarmLocked(deadlineExpiredElapsed); + setDeadlineExpiredAlarmLocked(deadlineExpiredElapsed, uid); } } @@ -211,11 +222,11 @@ public class TimeController extends StateController { * delay will expire. * This alarm <b>will</b> wake up the phone. */ - private void setDelayExpiredAlarmLocked(long alarmTimeElapsedMillis) { + private void setDelayExpiredAlarmLocked(long alarmTimeElapsedMillis, int uid) { alarmTimeElapsedMillis = maybeAdjustAlarmTime(alarmTimeElapsedMillis); mNextDelayExpiredElapsedMillis = alarmTimeElapsedMillis; updateAlarmWithListenerLocked(DELAY_TAG, mNextDelayExpiredListener, - mNextDelayExpiredElapsedMillis); + mNextDelayExpiredElapsedMillis, uid); } /** @@ -223,11 +234,11 @@ public class TimeController extends StateController { * deadline will expire. * This alarm <b>will</b> wake up the phone. */ - private void setDeadlineExpiredAlarmLocked(long alarmTimeElapsedMillis) { + private void setDeadlineExpiredAlarmLocked(long alarmTimeElapsedMillis, int uid) { alarmTimeElapsedMillis = maybeAdjustAlarmTime(alarmTimeElapsedMillis); mNextJobExpiredElapsedMillis = alarmTimeElapsedMillis; updateAlarmWithListenerLocked(DEADLINE_TAG, mDeadlineExpiredListener, - mNextJobExpiredElapsedMillis); + mNextJobExpiredElapsedMillis, uid); } private long maybeAdjustAlarmTime(long proposedAlarmTimeElapsedMillis) { @@ -239,7 +250,7 @@ public class TimeController extends StateController { } private void updateAlarmWithListenerLocked(String tag, OnAlarmListener listener, - long alarmTimeElapsed) { + long alarmTimeElapsed, int uid) { ensureAlarmServiceLocked(); if (alarmTimeElapsed == Long.MAX_VALUE) { mAlarmService.cancel(listener); @@ -248,7 +259,7 @@ public class TimeController extends StateController { Slog.d(TAG, "Setting " + tag + " for: " + alarmTimeElapsed); } mAlarmService.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, alarmTimeElapsed, - tag, listener, null); + AlarmManager.WINDOW_HEURISTIC, 0, tag, listener, null, new WorkSource(uid)); } } @@ -277,20 +288,39 @@ public class TimeController extends StateController { @Override public void dumpControllerStateLocked(PrintWriter pw, int filterUid) { final long nowElapsed = SystemClock.elapsedRealtime(); - pw.println("Alarms (" + SystemClock.elapsedRealtime() + ")"); - pw.println( - "Next delay alarm in " + (mNextDelayExpiredElapsedMillis - nowElapsed)/1000 + "s"); - pw.println("Next deadline alarm in " + (mNextJobExpiredElapsedMillis - nowElapsed)/1000 - + "s"); - pw.println("Tracking:"); + pw.print("Alarms: now="); + pw.print(SystemClock.elapsedRealtime()); + pw.println(); + pw.print("Next delay alarm in "); + TimeUtils.formatDuration(mNextDelayExpiredElapsedMillis, nowElapsed, pw); + pw.println(); + pw.print("Next deadline alarm in "); + TimeUtils.formatDuration(mNextJobExpiredElapsedMillis, nowElapsed, pw); + pw.println(); + pw.print("Tracking "); + pw.print(mTrackedJobs.size()); + pw.println(":"); for (JobStatus ts : mTrackedJobs) { if (!ts.shouldDump(filterUid)) { continue; } - pw.println(String.valueOf(ts.getJobId() + "," + ts.getUid()) - + ": (" + (ts.hasTimingDelayConstraint() ? ts.getEarliestRunTime() : "N/A") - + ", " + (ts.hasDeadlineConstraint() ?ts.getLatestRunTimeElapsed() : "N/A") - + ")"); + pw.print(" #"); + ts.printUniqueId(pw); + pw.print(" from "); + UserHandle.formatUid(pw, ts.getSourceUid()); + pw.print(": Delay="); + if (ts.hasTimingDelayConstraint()) { + TimeUtils.formatDuration(ts.getEarliestRunTime(), nowElapsed, pw); + } else { + pw.print("N/A"); + } + pw.print(", Deadline="); + if (ts.hasDeadlineConstraint()) { + TimeUtils.formatDuration(ts.getLatestRunTimeElapsed(), nowElapsed, pw); + } else { + pw.print("N/A"); + } + pw.println(); } } }
\ No newline at end of file diff --git a/services/core/java/com/android/server/notification/ManagedServices.java b/services/core/java/com/android/server/notification/ManagedServices.java index 53c5a6dc65e2..dc85dd7ef40e 100644 --- a/services/core/java/com/android/server/notification/ManagedServices.java +++ b/services/core/java/com/android/server/notification/ManagedServices.java @@ -16,6 +16,10 @@ package com.android.server.notification; +import static android.content.Context.BIND_ALLOW_WHITELIST_MANAGEMENT; +import static android.content.Context.BIND_AUTO_CREATE; +import static android.content.Context.BIND_FOREGROUND_SERVICE; + import android.annotation.NonNull; import android.app.ActivityManager; import android.app.PendingIntent; @@ -43,7 +47,6 @@ import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; import android.text.TextUtils; -import android.util.ArrayMap; import android.util.ArraySet; import android.util.Log; import android.util.Slog; @@ -56,7 +59,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.List; -import java.util.Map.Entry; import java.util.Objects; import java.util.Set; @@ -681,7 +683,7 @@ abstract public class ManagedServices { }; if (!mContext.bindServiceAsUser(intent, serviceConnection, - Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE, + BIND_AUTO_CREATE | BIND_FOREGROUND_SERVICE | BIND_ALLOW_WHITELIST_MANAGEMENT, new UserHandle(userid))) { mServicesBinding.remove(servicesBindingTag); Slog.w(TAG, "Unable to bind " + getCaption() + " service: " + intent); diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index 946e4f7e7067..0af0c7356fa3 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -40,11 +40,13 @@ import static android.service.notification.NotificationListenerService.TRIM_FULL import static android.service.notification.NotificationListenerService.TRIM_LIGHT; import static android.service.notification.NotificationListenerService.Ranking.IMPORTANCE_DEFAULT; import static android.service.notification.NotificationListenerService.Ranking.IMPORTANCE_NONE; + import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT; import android.Manifest; import android.annotation.Nullable; import android.app.ActivityManager; +import android.app.ActivityManagerInternal; import android.app.ActivityManagerNative; import android.app.AppGlobals; import android.app.AppOpsManager; @@ -56,6 +58,7 @@ import android.app.Notification; import android.app.NotificationManager; import android.app.NotificationManager.Policy; import android.app.PendingIntent; +import android.app.RemoteInput; import android.app.StatusBarManager; import android.app.backup.BackupManager; import android.app.usage.UsageEvents; @@ -64,6 +67,7 @@ import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; +import android.content.IIntentSender; import android.content.Intent; import android.content.IntentFilter; import android.content.pm.ApplicationInfo; @@ -90,6 +94,7 @@ import android.os.IBinder; import android.os.IInterface; import android.os.Looper; import android.os.Message; +import android.os.Parcelable; import android.os.Process; import android.os.RemoteException; import android.os.SystemClock; @@ -127,6 +132,7 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.internal.statusbar.NotificationVisibility; import com.android.internal.util.FastXmlSerializer; import com.android.internal.util.Preconditions; +import com.android.server.DeviceIdleController; import com.android.server.EventLogTags; import com.android.server.LocalServices; import com.android.server.SystemService; @@ -175,7 +181,7 @@ public class NotificationManagerService extends SystemService { = SystemProperties.getBoolean("debug.child_notifs", true); static final int MAX_PACKAGE_NOTIFICATIONS = 50; - static final float MAX_PACKAGE_ENQUEUE_RATE = 50f; + static final float DEFAULT_MAX_NOTIFICATION_ENQUEUE_RATE = 50f; // message codes static final int MESSAGE_TIMEOUT = 2; @@ -299,6 +305,7 @@ public class NotificationManagerService extends SystemService { private static final int MY_PID = Process.myPid(); private RankingHandler mRankingHandler; private long mLastOverRateLogTime; + private float mMaxPackageEnqueueRate = DEFAULT_MAX_NOTIFICATION_ENQUEUE_RATE; private static class Archive { final int mBufferSize; @@ -811,6 +818,8 @@ public class NotificationManagerService extends SystemService { private final class SettingsObserver extends ContentObserver { private final Uri NOTIFICATION_LIGHT_PULSE_URI = Settings.System.getUriFor(Settings.System.NOTIFICATION_LIGHT_PULSE); + private final Uri NOTIFICATION_RATE_LIMIT_URI + = Settings.Global.getUriFor(Settings.Global.MAX_NOTIFICATION_ENQUEUE_RATE); SettingsObserver(Handler handler) { super(handler); @@ -820,6 +829,8 @@ public class NotificationManagerService extends SystemService { ContentResolver resolver = getContext().getContentResolver(); resolver.registerContentObserver(NOTIFICATION_LIGHT_PULSE_URI, false, this, UserHandle.USER_ALL); + resolver.registerContentObserver(NOTIFICATION_RATE_LIMIT_URI, + false, this, UserHandle.USER_ALL); update(null); } @@ -837,6 +848,10 @@ public class NotificationManagerService extends SystemService { updateNotificationPulse(); } } + if (uri == null || NOTIFICATION_RATE_LIMIT_URI.equals(uri)) { + mMaxPackageEnqueueRate = Settings.Global.getFloat(resolver, + Settings.Global.MAX_NOTIFICATION_ENQUEUE_RATE, mMaxPackageEnqueueRate); + } } } @@ -893,6 +908,10 @@ public class NotificationManagerService extends SystemService { public void onStart() { Resources resources = getContext().getResources(); + mMaxPackageEnqueueRate = Settings.Global.getFloat(getContext().getContentResolver(), + Settings.Global.MAX_NOTIFICATION_ENQUEUE_RATE, + DEFAULT_MAX_NOTIFICATION_ENQUEUE_RATE); + mAm = ActivityManagerNative.getDefault(); mAppOps = (AppOpsManager) getContext().getSystemService(Context.APP_OPS_SERVICE); mVibrator = (Vibrator) getContext().getSystemService(Context.VIBRATOR_SERVICE); @@ -2363,6 +2382,7 @@ public class NotificationManagerService extends SystemService { pw.println(" mDisableNotificationEffects=" + mDisableNotificationEffects); pw.println(" mCallState=" + callStateToString(mCallState)); pw.println(" mSystemReady=" + mSystemReady); + pw.println(" mMaxPackageEnqueueRate=" + mMaxPackageEnqueueRate); } pw.println(" mArchive=" + mArchive.toString()); Iterator<StatusBarNotification> iter = mArchive.descendingIterator(); @@ -2506,7 +2526,7 @@ public class NotificationManagerService extends SystemService { if (!isSystemNotification && !isNotificationFromListener) { synchronized (mNotificationList) { final float appEnqueueRate = mUsageStats.getAppEnqueueRate(pkg); - if (appEnqueueRate > MAX_PACKAGE_ENQUEUE_RATE) { + if (appEnqueueRate > mMaxPackageEnqueueRate) { mUsageStats.registerOverRateQuota(pkg); final long now = SystemClock.elapsedRealtime(); if ((now - mLastOverRateLogTime) > MIN_PACKAGE_OVERRATE_LOG_INTERVAL) { @@ -2542,6 +2562,8 @@ public class NotificationManagerService extends SystemService { + " id=" + id + " notification=" + notification); } + markAsSentFromNotification(notification); + // Sanitize inputs notification.priority = clamp(notification.priority, Notification.PRIORITY_MIN, Notification.PRIORITY_MAX); @@ -2556,6 +2578,66 @@ public class NotificationManagerService extends SystemService { idOut[0] = id; } + private static void markAsSentFromNotification(Notification notification) { + final ActivityManagerInternal am = LocalServices.getService(ActivityManagerInternal.class); + final long duration = LocalServices.getService(DeviceIdleController.LocalService.class) + .getNotificationWhitelistDuration(); + + int size = 0; + if (notification.contentIntent != null) { + am.setPendingIntentWhitelistDuration(notification.contentIntent.getTarget(), duration); + } + if (notification.deleteIntent != null) { + am.setPendingIntentWhitelistDuration(notification.deleteIntent.getTarget(), duration); + } + if (notification.fullScreenIntent != null) { + am.setPendingIntentWhitelistDuration(notification.fullScreenIntent.getTarget(), + duration); + } + if (notification.actions != null) { + for (Notification.Action action: notification.actions) { + if (action.actionIntent == null) { + continue; + } + am.setPendingIntentWhitelistDuration(action.actionIntent.getTarget(), duration); + setPendingIntentWhitelistDuration(am, duration, action.getExtras()); + final RemoteInput[] remoteInputs = action.getRemoteInputs(); + if (remoteInputs != null) { + for (RemoteInput remoteInput : remoteInputs) { + setPendingIntentWhitelistDuration(am, duration, remoteInput.getExtras()); + } + } + } + } + } + + private static void setPendingIntentWhitelistDuration(ActivityManagerInternal am, long duration, + Bundle extras) { + for (String key : extras.keySet()) { + setPendingIntentWhitelistDuration(am, duration, extras.getParcelable(key)); + final Parcelable[] parcelableArray = extras.getParcelableArray(key); + if (parcelableArray != null) { + for (Parcelable parcelable: parcelableArray) { + setPendingIntentWhitelistDuration(am, duration, parcelable); + } + } + final ArrayList<Parcelable> parcelableList = extras.getParcelableArrayList(key); + if (parcelableList != null) { + for (Parcelable parcelable: parcelableList) { + setPendingIntentWhitelistDuration(am, duration, parcelable); + } + } + } + } + + private static void setPendingIntentWhitelistDuration(ActivityManagerInternal am, long duration, + Parcelable parcelable) { + if (parcelable instanceof PendingIntent) { + am.setPendingIntentWhitelistDuration(((PendingIntent) parcelable).getTarget(), + duration); + } + } + private class EnqueueNotificationRunnable implements Runnable { private final NotificationRecord r; private final int userId; @@ -3813,8 +3895,10 @@ public class NotificationManagerService extends SystemService { @Override public void onUserSwitched(int user) { - for (ManagedServiceInfo info : mServices) { - unregisterService(info.service, info.userid); + synchronized (mNotificationList) { + for (ManagedServiceInfo info : mServices) { + unregisterService(info.service, info.userid); + } } registerRanker(); } diff --git a/services/core/java/com/android/server/notification/NotificationRecord.java b/services/core/java/com/android/server/notification/NotificationRecord.java index 7c89e9f0ba93..367f8cbb3458 100644 --- a/services/core/java/com/android/server/notification/NotificationRecord.java +++ b/services/core/java/com/android/server/notification/NotificationRecord.java @@ -318,8 +318,12 @@ public final class NotificationRecord { public void setContactAffinity(float contactAffinity) { mContactAffinity = contactAffinity; + if (mImportance < IMPORTANCE_HIGH && + mContactAffinity >= ValidateNotificationPeople.STARRED_CONTACT) { + setImportance(IMPORTANCE_HIGH, getPeopleExplanation()); + } if (mImportance < IMPORTANCE_DEFAULT && - mContactAffinity > ValidateNotificationPeople.VALID_CONTACT) { + mContactAffinity >= ValidateNotificationPeople.VALID_CONTACT) { setImportance(IMPORTANCE_DEFAULT, getPeopleExplanation()); } } diff --git a/services/core/java/com/android/server/pm/BackgroundDexOptService.java b/services/core/java/com/android/server/pm/BackgroundDexOptService.java index ee02a9954a5a..87f0581a7879 100644 --- a/services/core/java/com/android/server/pm/BackgroundDexOptService.java +++ b/services/core/java/com/android/server/pm/BackgroundDexOptService.java @@ -154,7 +154,6 @@ public class BackgroundDexOptService extends JobService { // behave differently than "pm.dexopt.bg-dexopt=speed-profile" but that's a // trade-off worth doing to save boot time work. pm.performDexOpt(pkg, - /* instruction set */ null, /* checkProfiles */ false, PackageManagerService.REASON_BOOT, /* force */ false); @@ -192,7 +191,6 @@ public class BackgroundDexOptService extends JobService { // Optimize package if needed. Note that there can be no race between // concurrent jobs because PackageDexOptimizer.performDexOpt is synchronized. if (pm.performDexOpt(pkg, - /* instruction set */ null, /* checkProfiles */ true, PackageManagerService.REASON_BACKGROUND_DEXOPT, /* force */ false)) { diff --git a/services/core/java/com/android/server/pm/Installer.java b/services/core/java/com/android/server/pm/Installer.java index 913c82428ec6..7b85a4f25cee 100644 --- a/services/core/java/com/android/server/pm/Installer.java +++ b/services/core/java/com/android/server/pm/Installer.java @@ -153,6 +153,11 @@ public final class Installer extends SystemService { return mInstaller.mergeProfiles(uid, pkgName); } + public boolean dumpProfiles(String gid, String packageName, String codePaths) + throws InstallerException { + return mInstaller.dumpProfiles(gid, packageName, codePaths); + } + public void idmap(String targetApkPath, String overlayApkPath, int uid) throws InstallerException { mInstaller.execute("idmap", targetApkPath, overlayApkPath, uid); diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 35bcaa98bd64..3999d188b79c 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -105,6 +105,7 @@ import android.annotation.Nullable; import android.app.ActivityManager; import android.app.ActivityManagerNative; import android.app.IActivityManager; +import android.app.ResourcesManager; import android.app.admin.DevicePolicyManagerInternal; import android.app.admin.IDevicePolicyManager; import android.app.admin.SecurityLog; @@ -238,6 +239,7 @@ import com.android.internal.util.FastXmlSerializer; import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.Preconditions; import com.android.internal.util.XmlUtils; +import com.android.server.AttributeCache; import com.android.server.EventLogTags; import com.android.server.FgThread; import com.android.server.IntentResolver; @@ -2395,6 +2397,10 @@ public class PackageManagerService extends IPackageManager.Stub { mPromoteSystemApps = mIsUpgrade && ver.sdkVersion <= Build.VERSION_CODES.LOLLIPOP_MR1; + // When upgrading from pre-N, we need to handle package extraction like first boot, + // as there is no profiling data available. + mIsPreNUpgrade = mIsUpgrade && ver.sdkVersion < Build.VERSION_CODES.N; + // save off the names of pre-existing system packages prior to scanning; we don't // want to automatically grant runtime permissions for new system apps if (mPromoteSystemApps) { @@ -2407,11 +2413,6 @@ public class PackageManagerService extends IPackageManager.Stub { } } - // When upgrading from pre-N, we need to handle package extraction like first boot, - // as there is no profiling data available. - mIsPreNUpgrade = !mSettings.isNWorkDone(); - mSettings.setNWorkDone(); - // Collect vendor overlay packages. // (Do this before scanning any apps.) // For security and version matching reason, only consider @@ -2724,7 +2725,6 @@ public class PackageManagerService extends IPackageManager.Stub { StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE | Installer.FLAG_CLEAR_CODE_CACHE_ONLY); } - clearAppProfilesLIF(ps.pkg, UserHandle.USER_ALL); } ver.fingerprint = Build.FINGERPRINT; } @@ -7267,7 +7267,6 @@ public class PackageManagerService extends IPackageManager.Stub { // behave differently than "pm.dexopt.bg-dexopt=speed-profile" but that's a // trade-off worth doing to save boot time work. int dexOptStatus = performDexOptTraced(pkg.packageName, - null /* instructionSet */, false /* checkProfiles */, getCompilerFilterForReason(causeFirstBoot ? REASON_FIRST_BOOT : REASON_BOOT), false /* force */); @@ -7309,33 +7308,33 @@ public class PackageManagerService extends IPackageManager.Stub { // TODO: this is not used nor needed. Delete it. @Override - public boolean performDexOptIfNeeded(String packageName, String instructionSet) { - int dexOptStatus = performDexOptTraced(packageName, instructionSet, + public boolean performDexOptIfNeeded(String packageName) { + int dexOptStatus = performDexOptTraced(packageName, false /* checkProfiles */, getFullCompilerFilter(), false /* force */); return dexOptStatus != PackageDexOptimizer.DEX_OPT_FAILED; } @Override - public boolean performDexOpt(String packageName, String instructionSet, + public boolean performDexOpt(String packageName, boolean checkProfiles, int compileReason, boolean force) { - int dexOptStatus = performDexOptTraced(packageName, instructionSet, checkProfiles, + int dexOptStatus = performDexOptTraced(packageName, checkProfiles, getCompilerFilterForReason(compileReason), force); return dexOptStatus != PackageDexOptimizer.DEX_OPT_FAILED; } @Override - public boolean performDexOptMode(String packageName, String instructionSet, + public boolean performDexOptMode(String packageName, boolean checkProfiles, String targetCompilerFilter, boolean force) { - int dexOptStatus = performDexOptTraced(packageName, instructionSet, checkProfiles, + int dexOptStatus = performDexOptTraced(packageName, checkProfiles, targetCompilerFilter, force); return dexOptStatus != PackageDexOptimizer.DEX_OPT_FAILED; } - private int performDexOptTraced(String packageName, String instructionSet, + private int performDexOptTraced(String packageName, boolean checkProfiles, String targetCompilerFilter, boolean force) { Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "dexopt"); try { - return performDexOptInternal(packageName, instructionSet, checkProfiles, + return performDexOptInternal(packageName, checkProfiles, targetCompilerFilter, force); } finally { Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER); @@ -7344,10 +7343,9 @@ public class PackageManagerService extends IPackageManager.Stub { // Run dexopt on a given package. Returns true if dexopt did not fail, i.e. // if the package can now be considered up to date for the given filter. - private int performDexOptInternal(String packageName, String instructionSet, + private int performDexOptInternal(String packageName, boolean checkProfiles, String targetCompilerFilter, boolean force) { PackageParser.Package p; - final String targetInstructionSet; synchronized (mPackages) { p = mPackages.get(packageName); if (p == null) { @@ -7355,15 +7353,11 @@ public class PackageManagerService extends IPackageManager.Stub { return PackageDexOptimizer.DEX_OPT_FAILED; } mPackageUsage.write(false); - - targetInstructionSet = instructionSet != null ? instructionSet : - getPrimaryInstructionSet(p.applicationInfo); } long callingId = Binder.clearCallingIdentity(); try { synchronized (mInstallLock) { - final String[] instructionSets = new String[] { targetInstructionSet }; - return performDexOptInternalWithDependenciesLI(p, instructionSets, checkProfiles, + return performDexOptInternalWithDependenciesLI(p, checkProfiles, targetCompilerFilter, force); } } finally { @@ -7384,7 +7378,7 @@ public class PackageManagerService extends IPackageManager.Stub { } private int performDexOptInternalWithDependenciesLI(PackageParser.Package p, - String instructionSets[], boolean checkProfiles, String targetCompilerFilter, + boolean checkProfiles, String targetCompilerFilter, boolean force) { // Select the dex optimizer based on the force parameter. // Note: The force option is rarely used (cmdline input for testing, mostly), so it's OK to @@ -7396,6 +7390,7 @@ public class PackageManagerService extends IPackageManager.Stub { // Optimize all dependencies first. Note: we ignore the return value and march on // on errors. Collection<PackageParser.Package> deps = findSharedNonSystemLibraries(p); + final String[] instructionSets = getAppDexInstructionSets(p.applicationInfo); if (!deps.isEmpty()) { for (PackageParser.Package depPackage : deps) { // TODO: Analyze and investigate if we (should) profile libraries. @@ -7405,7 +7400,6 @@ public class PackageManagerService extends IPackageManager.Stub { getCompilerFilterForReason(REASON_NON_SYSTEM_LIBRARY)); } } - return pdo.performDexOpt(p, p.usesLibraryFiles, instructionSets, checkProfiles, targetCompilerFilter); } @@ -7465,6 +7459,45 @@ public class PackageManagerService extends IPackageManager.Stub { } @Override + public void dumpProfiles(String packageName) { + PackageParser.Package pkg; + synchronized (mPackages) { + pkg = mPackages.get(packageName); + if (pkg == null) { + throw new IllegalArgumentException("Unknown package: " + packageName); + } + } + /* Only the shell or the app user should be able to dump profiles. */ + int callingUid = Binder.getCallingUid(); + if (callingUid != Process.SHELL_UID && callingUid != pkg.applicationInfo.uid) { + throw new SecurityException("dumpProfiles"); + } + + synchronized (mInstallLock) { + Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "dump profiles"); + final int sharedGid = UserHandle.getSharedAppGid(pkg.applicationInfo.uid); + try { + final File codeFile = new File(pkg.applicationInfo.getCodePath()); + List<String> allCodePaths = Collections.EMPTY_LIST; + if (codeFile != null && codeFile.exists()) { + try { + final PackageLite codePkg = PackageParser.parsePackageLite(codeFile, 0); + allCodePaths = codePkg.getAllCodePaths(); + } catch (PackageParserException e) { + // Well, we tried. + } + } + String gid = Integer.toString(sharedGid); + String codePaths = TextUtils.join(";", allCodePaths); + mInstaller.dumpProfiles(gid, packageName, codePaths); + } catch (InstallerException e) { + Slog.w(TAG, "Failed to dump profiles", e); + } + Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER); + } + } + + @Override public void forceDexOpt(String packageName) { enforceSystemOrRoot("forceDexOpt"); @@ -7477,14 +7510,11 @@ public class PackageManagerService extends IPackageManager.Stub { } synchronized (mInstallLock) { - final String[] instructionSets = new String[] { - getPrimaryInstructionSet(pkg.applicationInfo) }; - Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "dexopt"); // Whoever is calling forceDexOpt wants a fully compiled package. // Don't use profiles since that may cause compilation to be skipped. - final int res = performDexOptInternalWithDependenciesLI(pkg, instructionSets, + final int res = performDexOptInternalWithDependenciesLI(pkg, false /* checkProfiles */, getCompilerFilterForReason(REASON_FORCED_DEXOPT), true /* force */); @@ -16300,11 +16330,11 @@ public class PackageManagerService extends IPackageManager.Stub { final int appId = UserHandle.getAppId(pkg.applicationInfo.uid); removeKeystoreDataIfNeeded(userId, appId); - final UserManager um = mContext.getSystemService(UserManager.class); + UserManagerInternal umInternal = getUserManagerInternal(); final int flags; - if (um.isUserUnlockingOrUnlocked(userId)) { + if (umInternal.isUserUnlockingOrUnlocked(userId)) { flags = StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE; - } else if (um.isUserRunning(userId)) { + } else if (umInternal.isUserRunning(userId)) { flags = StorageManager.FLAG_STORAGE_DE; } else { flags = 0; @@ -19063,11 +19093,12 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName()); // Reconcile app data for all started/unlocked users final StorageManager sm = mContext.getSystemService(StorageManager.class); final UserManager um = mContext.getSystemService(UserManager.class); + UserManagerInternal umInternal = getUserManagerInternal(); for (UserInfo user : um.getUsers()) { final int flags; - if (um.isUserUnlockingOrUnlocked(user.id)) { + if (umInternal.isUserUnlockingOrUnlocked(user.id)) { flags = StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE; - } else if (um.isUserRunning(user.id)) { + } else if (umInternal.isUserRunning(user.id)) { flags = StorageManager.FLAG_STORAGE_DE; } else { continue; @@ -19143,6 +19174,11 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName()); Slog.w(TAG, "Failed to unload " + ps.codePath); } } + + // Try very hard to release any references to this package + // so we don't risk the system server being killed due to + // open FDs + AttributeCache.instance().removePackage(ps.name); } mSettings.writeLPr(); @@ -19151,6 +19187,15 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName()); if (DEBUG_INSTALL) Slog.d(TAG, "Unloaded packages " + unloaded); sendResourcesChangedBroadcast(false, false, unloaded, null); + + // Try very hard to release any references to this path so we don't risk + // the system server being killed due to open FDs + ResourcesManager.getInstance().invalidatePath(vol.getPath().getAbsolutePath()); + + for (int i = 0; i < 3; i++) { + System.gc(); + System.runFinalization(); + } } /** @@ -19491,11 +19536,12 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName()); } final UserManager um = mContext.getSystemService(UserManager.class); + UserManagerInternal umInternal = getUserManagerInternal(); for (UserInfo user : um.getUsers()) { final int flags; - if (um.isUserUnlockingOrUnlocked(user.id)) { + if (umInternal.isUserUnlockingOrUnlocked(user.id)) { flags = StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE; - } else if (um.isUserRunning(user.id)) { + } else if (umInternal.isUserRunning(user.id)) { flags = StorageManager.FLAG_STORAGE_DE; } else { continue; diff --git a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java index b305ba71863b..751c5858446b 100644 --- a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java +++ b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java @@ -34,6 +34,8 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; import java.util.Date; import java.util.HashSet; import java.util.Iterator; @@ -66,15 +68,15 @@ public class PackageManagerServiceUtils { } private static void filterRecentlyUsedApps(Collection<PackageParser.Package> pkgs, + long estimatedPreviousSystemUseTime, long dexOptLRUThresholdInMills) { // Filter out packages that aren't recently used. int total = pkgs.size(); int skipped = 0; - long now = System.currentTimeMillis(); for (Iterator<PackageParser.Package> i = pkgs.iterator(); i.hasNext();) { PackageParser.Package pkg = i.next(); long then = pkg.getLatestForegroundPackageUseTimeInMills(); - if (then + dexOptLRUThresholdInMills < now) { + if (then < estimatedPreviousSystemUseTime - dexOptLRUThresholdInMills) { if (DEBUG_DEXOPT) { Log.i(TAG, "Skipping dexopt of " + pkg.packageName + " last used in foreground: " + @@ -82,6 +84,12 @@ public class PackageManagerServiceUtils { } i.remove(); skipped++; + } else { + if (DEBUG_DEXOPT) { + Log.i(TAG, "Will dexopt " + pkg.packageName + + " last used in foreground: " + + ((then == 0) ? "never" : new Date(then))); + } } } if (DEBUG_DEXOPT) { @@ -136,8 +144,24 @@ public class PackageManagerServiceUtils { // Filter out packages that aren't recently used, add all remaining apps. // TODO: add a property to control this? - if (packageManagerService.isHistoricalPackageUsageAvailable()) { - filterRecentlyUsedApps(remainingPkgs, SEVEN_DAYS_IN_MILLISECONDS); + if (!remainingPkgs.isEmpty() && packageManagerService.isHistoricalPackageUsageAvailable()) { + if (DEBUG_DEXOPT) { + Log.i(TAG, "Looking at historical package use"); + } + // Get the package that was used last. + PackageParser.Package lastUsed = Collections.max(remainingPkgs, (pkg1, pkg2) -> + Long.compare(pkg1.getLatestForegroundPackageUseTimeInMills(), + pkg2.getLatestForegroundPackageUseTimeInMills())); + if (DEBUG_DEXOPT) { + Log.i(TAG, "Taking package " + lastUsed.packageName + " as reference in time use"); + } + long estimatedPreviousSystemUseTime = + lastUsed.getLatestForegroundPackageUseTimeInMills(); + // Be defensive if for some reason package usage has bogus data. + if (estimatedPreviousSystemUseTime != 0) { + filterRecentlyUsedApps(remainingPkgs, estimatedPreviousSystemUseTime, + SEVEN_DAYS_IN_MILLISECONDS); + } } result.addAll(remainingPkgs); diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java index 1eeff14568c6..05f5b8f1ac6c 100644 --- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java +++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java @@ -105,6 +105,8 @@ class PackageManagerShellCommand extends ShellCommand { return runInstallWrite(); case "compile": return runCompile(); + case "dump-profiles": + return runDumpProfiles(); case "list": return runList(); case "uninstall": @@ -358,7 +360,7 @@ class PackageManagerShellCommand extends ShellCommand { mInterface.clearApplicationProfileData(packageName); } - boolean result = mInterface.performDexOptMode(packageName, null /* instructionSet */, + boolean result = mInterface.performDexOptMode(packageName, checkProfiles, targetCompilerFilter, forceCompilation); if (!result) { failedPackages.add(packageName); @@ -387,6 +389,12 @@ class PackageManagerShellCommand extends ShellCommand { } } + private int runDumpProfiles() throws RemoteException { + String packageName = getNextArg(); + mInterface.dumpProfiles(packageName); + return 0; + } + private int runList() throws RemoteException { final PrintWriter pw = getOutPrintWriter(); final String type = getNextArg(); diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java index 75bd35c0eca4..dfd6dfe1c775 100644 --- a/services/core/java/com/android/server/pm/Settings.java +++ b/services/core/java/com/android/server/pm/Settings.java @@ -191,7 +191,6 @@ final class Settings { private static final String TAG_DEFAULT_BROWSER = "default-browser"; private static final String TAG_DEFAULT_DIALER = "default-dialer"; private static final String TAG_VERSION = "version"; - private static final String TAG_N_WORK = "n-work"; private static final String ATTR_NAME = "name"; private static final String ATTR_USER = "user"; @@ -398,17 +397,6 @@ final class Settings { public final KeySetManagerService mKeySetManagerService = new KeySetManagerService(mPackages); - /** - * Used to track whether N+ work has been done. This is similar to the file-system level - * and denotes that first-boot or upgrade-to-N work has been done. - * - * Note: the flag has been added to a) allow tracking while an API level check is impossible - * and b) to merge upgrade as well as first boot (because the flag is false, by default). - * - * STOPSHIP: b/27872764 - */ - private boolean mIsNWorkDone = false; - Settings(Object lock) { this(Environment.getDataDirectory(), lock); } @@ -2396,10 +2384,6 @@ final class Settings { mKeySetManagerService.writeKeySetManagerServiceLPr(serializer); - serializer.startTag(null, TAG_N_WORK); - serializer.attribute(null, ATTR_DONE, Boolean.toString(mIsNWorkDone)); - serializer.endTag(null, TAG_N_WORK); - serializer.endTag(null, "packages"); serializer.endDocument(); @@ -2937,8 +2921,6 @@ final class Settings { ver.sdkVersion = XmlUtils.readIntAttribute(parser, ATTR_SDK_VERSION); ver.databaseVersion = XmlUtils.readIntAttribute(parser, ATTR_SDK_VERSION); ver.fingerprint = XmlUtils.readStringAttribute(parser, ATTR_FINGERPRINT); - } else if (TAG_N_WORK.equals(tagName)) { - mIsNWorkDone = XmlUtils.readBooleanAttribute(parser, ATTR_DONE, false); } else { Slog.w(PackageManagerService.TAG, "Unknown element under <packages>: " + parser.getName()); @@ -4233,14 +4215,6 @@ final class Settings { return res; } - public boolean isNWorkDone() { - return mIsNWorkDone; - } - - void setNWorkDone() { - mIsNWorkDone = true; - } - static void printFlags(PrintWriter pw, int val, Object[] spec) { pw.print("[ "); for (int i=0; i<spec.length; i+=2) { diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 33ccf160f8d0..b9167905612d 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -22,7 +22,6 @@ import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; import android.Manifest; import android.annotation.NonNull; import android.annotation.Nullable; -import android.annotation.SystemApi; import android.annotation.UserIdInt; import android.app.Activity; import android.app.ActivityManager; @@ -31,9 +30,7 @@ import android.app.ActivityManagerNative; import android.app.IActivityManager; import android.app.IStopUserCallback; import android.app.KeyguardManager; -import android.app.admin.DevicePolicyManager; import android.content.BroadcastReceiver; -import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; @@ -76,6 +73,7 @@ import android.util.Log; import android.util.Slog; import android.util.SparseArray; import android.util.SparseBooleanArray; +import android.util.SparseIntArray; import android.util.TimeUtils; import android.util.Xml; @@ -88,6 +86,7 @@ import com.android.internal.util.Preconditions; import com.android.internal.util.XmlUtils; import com.android.internal.widget.LockPatternUtils; import com.android.server.LocalServices; +import com.android.server.am.UserState; import libcore.io.IoUtils; import libcore.util.Objects; @@ -329,8 +328,8 @@ public class UserManagerService extends IUserManager.Stub { @GuardedBy("mUsersLock") private boolean mForceEphemeralUsers; - @GuardedBy("mUsersLock") - private final SparseBooleanArray mUnlockingOrUnlockedUsers = new SparseBooleanArray(); + @GuardedBy("mUserStates") + private final SparseIntArray mUserStates = new SparseIntArray(); private static UserManagerService sInstance; @@ -377,6 +376,7 @@ public class UserManagerService extends IUserManager.Stub { mLocalService = new LocalService(); LocalServices.addService(UserManagerInternal.class, mLocalService); mLockPatternUtils = new LockPatternUtils(mContext); + mUserStates.put(UserHandle.USER_SYSTEM, UserState.STATE_BOOTING); } void systemReady() { @@ -1009,9 +1009,13 @@ public class UserManagerService extends IUserManager.Stub { // in getUserRestrictionSource on who set local policies. mGlobalRestrictionOwnerUserId = userId; } else { - // When profile owner sets restrictions it passes null global bundle and we reset - // global restriction owner userId. - mGlobalRestrictionOwnerUserId = UserHandle.USER_NULL; + if (mGlobalRestrictionOwnerUserId == userId) { + // When profile owner sets restrictions it passes null global bundle and we + // reset global restriction owner userId. + // This means this user used to have DO, but now the DO is gone and the user + // instead has PO. + mGlobalRestrictionOwnerUserId = UserHandle.USER_NULL; + } } { // Update local. @@ -2375,7 +2379,9 @@ public class UserManagerService extends IUserManager.Stub { synchronized (mUsersLock) { mUsers.remove(userHandle); mIsUserManaged.delete(userHandle); - mUnlockingOrUnlockedUsers.delete(userHandle); + } + synchronized (mUserStates) { + mUserStates.delete(userHandle); } synchronized (mRestrictionsLock) { mBaseUserRestrictions.remove(userHandle); @@ -3055,6 +3061,9 @@ public class UserManagerService extends IUserManager.Stub { pw.println(); pw.println(" Device managed: " + mIsDeviceManaged); } + synchronized (mUserStates) { + pw.println(" Started users state: " + mUserStates); + } // Dump some capabilities pw.println(); pw.println(" Max users: " + UserManager.getMaxSupportedUsers()); @@ -3241,16 +3250,32 @@ public class UserManagerService extends IUserManager.Stub { } @Override - public void setUserUnlockingOrUnlocked(int userId, boolean unlockingOrUnlocked) { - synchronized (mUsersLock) { - mUnlockingOrUnlockedUsers.put(userId, unlockingOrUnlocked); + public boolean isUserRunning(int userId) { + synchronized (mUserStates) { + return mUserStates.get(userId, -1) >= 0; + } + } + + @Override + public void setUserState(int userId, int userState) { + synchronized (mUserStates) { + mUserStates.put(userId, userState); + } + } + + @Override + public void removeUserState(int userId) { + synchronized (mUserStates) { + mUserStates.delete(userId); } } @Override public boolean isUserUnlockingOrUnlocked(int userId) { - synchronized (mUsersLock) { - return mUnlockingOrUnlockedUsers.get(userId); + synchronized (mUserStates) { + int state = mUserStates.get(userId, -1); + return (state == UserState.STATE_RUNNING_UNLOCKING) + || (state == UserState.STATE_RUNNING_UNLOCKED); } } } diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 0cafb93a060b..66bb24d02de4 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -4360,6 +4360,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { pf.bottom = df.bottom = of.bottom = mUnrestrictedScreenTop + mUnrestrictedScreenHeight; // ...with content insets above the nav bar cf.bottom = vf.bottom = mStableBottom; + if (mStatusBar != null && mFocusedWindow == mStatusBar && canReceiveInput(mStatusBar)) { + // The status bar forces the navigation bar while it's visible. Make sure the IME + // avoids the navigation bar in that case. + pf.right = df.right = of.right = cf.right = vf.right = mStableRight; + } // IM dock windows always go to the bottom of the screen. attrs.gravity = Gravity.BOTTOM; mDockLayer = win.getSurfaceLayer(); diff --git a/services/core/java/com/android/server/tv/TvInputHardwareManager.java b/services/core/java/com/android/server/tv/TvInputHardwareManager.java index 5c6a69682b61..8043c651751c 100644 --- a/services/core/java/com/android/server/tv/TvInputHardwareManager.java +++ b/services/core/java/com/android/server/tv/TvInputHardwareManager.java @@ -742,7 +742,10 @@ class TvInputHardwareManager implements TvInputHal.Callback { synchronized (mImplLock) { mAudioSource = null; mAudioSink.clear(); - mAudioPatch = null; + if (mAudioPatch != null) { + mAudioManager.releaseAudioPatch(mAudioPatch); + mAudioPatch = null; + } } } }; @@ -980,6 +983,9 @@ class TvInputHardwareManager implements TvInputHal.Callback { } if (shouldRecreateAudioPatch) { mCommittedVolume = volume; + if (mAudioPatch != null) { + mAudioManager.releaseAudioPatch(mAudioPatch); + } mAudioManager.createAudioPatch( audioPatchArray, new AudioPortConfig[] { sourceConfig }, diff --git a/services/core/java/com/android/server/wm/DockedStackDividerController.java b/services/core/java/com/android/server/wm/DockedStackDividerController.java index 1b31d07cf31e..e73649ddcf3c 100644 --- a/services/core/java/com/android/server/wm/DockedStackDividerController.java +++ b/services/core/java/com/android/server/wm/DockedStackDividerController.java @@ -45,9 +45,11 @@ import android.view.SurfaceControl; import android.view.animation.AnimationUtils; import android.view.animation.Interpolator; import android.view.animation.PathInterpolator; +import android.view.inputmethod.InputMethodManagerInternal; import com.android.internal.policy.DividerSnapAlgorithm; import com.android.internal.policy.DockedDividerUtils; +import com.android.server.LocalServices; import com.android.server.wm.DimLayer.DimLayerUser; import com.android.server.wm.WindowManagerService.H; @@ -131,6 +133,7 @@ public class DockedStackDividerController implements DimLayerUser { private float mLastAnimationProgress; private float mLastDividerProgress; private final DividerSnapAlgorithm[] mSnapAlgorithmForRotation = new DividerSnapAlgorithm[4]; + private boolean mImeHideRequested; DockedStackDividerController(WindowManagerService service, DisplayContent displayContent) { mService = service; @@ -375,11 +378,39 @@ public class DockedStackDividerController implements DimLayerUser { } } mDockedStackListeners.finishBroadcast(); - if (!exists) { + if (exists) { + InputMethodManagerInternal inputMethodManagerInternal = + LocalServices.getService(InputMethodManagerInternal.class); + if (inputMethodManagerInternal != null) { + + // Hide the current IME to avoid problems with animations from IME adjustment when + // attaching the docked stack. + inputMethodManagerInternal.hideCurrentInputMethod(); + mImeHideRequested = true; + } + } else { setMinimizedDockedStack(false); } } + /** + * Resets the state that IME hide has been requested. See {@link #isImeHideRequested}. + */ + void resetImeHideRequested() { + mImeHideRequested = false; + } + + /** + * The docked stack divider controller makes sure the IME gets hidden when attaching the docked + * stack, to avoid animation problems. This flag indicates whether the request to hide the IME + * has been sent in an asynchronous manner, and the IME should be treated as hidden already. + * + * @return whether IME hide request has been sent + */ + boolean isImeHideRequested() { + return mImeHideRequested; + } + void notifyDockedStackMinimizedChanged(boolean minimizedDock, long animDuration) { mService.mH.removeMessages(NOTIFY_DOCKED_STACK_MINIMIZED_CHANGED); mService.mH.obtainMessage(NOTIFY_DOCKED_STACK_MINIMIZED_CHANGED, @@ -606,7 +637,12 @@ public class DockedStackDividerController implements DimLayerUser { private void setMinimizedDockedStack(boolean minimized) { final TaskStack stack = mDisplayContent.getDockedStackVisibleForUserLocked(); notifyDockedStackMinimizedChanged(minimized, 0); - setMinimizeAmount(stack, minimized ? 1f : 0f); + if (stack == null) { + return; + } + if (stack.setAdjustedForMinimizedDock(minimized ? 1f : 0f)) { + mService.mWindowPlacerLocked.performSurfacePlacement(); + } } private boolean isAnimationMaximizing() { @@ -690,8 +726,11 @@ public class DockedStackDividerController implements DimLayerUser { float t = Math.min(1f, (float) (now - mAnimationStartTime) / mAnimationDuration); t = (isAnimationMaximizing() ? TOUCH_RESPONSE_INTERPOLATOR : mMinimizedDockInterpolator) .getInterpolation(t); - setMinimizeAmount(stack, getMinimizeAmount(stack, t)); - + if (stack != null) { + if (stack.setAdjustedForMinimizedDock(getMinimizeAmount(stack, t))) { + mService.mWindowPlacerLocked.performSurfacePlacement(); + } + } if (t >= 1.0f) { mAnimatingForMinimizedDockedStack = false; return false; @@ -700,42 +739,6 @@ public class DockedStackDividerController implements DimLayerUser { } } - void setMinimizeAmount(TaskStack dockedStack, float minimizeAmount) { - final ArrayList<TaskStack> stacks = mDisplayContent.getStacks(); - - // If the docked stack is not visible, clear the complementary stack on all stacks. - if (dockedStack == null) { - for (int i = stacks.size() - 1; i >= 0; --i) { - final TaskStack stack = stacks.get(i); - stack.resetAdjustedForComplementDock(); - } - return; - } - - // Otherwise if the docked stack minimize amount has changed, update the adjusted bounds - // on the other stack that's currently visible, so that the stack's getDimBounds() - // occupies what's left by the docked stack. This is needed so that stuff like wallpaper - // gets cropped properly to the area left by the dock. - if (dockedStack.setAdjustedForMinimizedDock(minimizeAmount)) { - final boolean adjusted = - dockedStack.isVisibleForUserLocked() && minimizeAmount != 0.0f; - dockedStack.getDimBounds(mTmpRect2); - int dockSide = dockedStack.getDockSide(); - for (int i = stacks.size() - 1; i >= 0; --i) { - final TaskStack stack = stacks.get(i); - if (stack == dockedStack) { - continue; - } - if (stack.isVisibleLocked() && adjusted) { - stack.setAdjustedForComplementDock(mTmpRect2, dockSide); - } else { - stack.resetAdjustedForComplementDock(); - } - } - mService.mWindowPlacerLocked.performSurfacePlacement(); - } - } - private float getInterpolatedAnimationValue(float t) { return t * mAnimationTarget + (1 - t) * mAnimationStart; } diff --git a/services/core/java/com/android/server/wm/TaskStack.java b/services/core/java/com/android/server/wm/TaskStack.java index 114d9bed827c..8be5b19d1530 100644 --- a/services/core/java/com/android/server/wm/TaskStack.java +++ b/services/core/java/com/android/server/wm/TaskStack.java @@ -123,7 +123,6 @@ public class TaskStack implements DimLayer.DimLayerUser, private float mAdjustImeAmount; private float mAdjustDividerAmount; private final int mDockedStackMinimizeThickness; - private boolean mAdjustedForForComplementDock; // If this is true, we are in the bounds animating mode. // The task will be down or upscaled to perfectly fit the @@ -243,9 +242,7 @@ public class TaskStack implements DimLayer.DimLayerUser, insetBounds = mFullyAdjustedImeBounds; } } - if (!mAdjustedForForComplementDock) { - alignTasksToAdjustedBounds(adjusted ? mAdjustedBounds : mBounds, insetBounds); - } + alignTasksToAdjustedBounds(adjusted ? mAdjustedBounds : mBounds, insetBounds); mDisplayContent.layoutNeeded = true; } @@ -864,7 +861,6 @@ public class TaskStack implements DimLayer.DimLayerUser, mImeWin = imeWin; mImeGoingAway = false; if (!mAdjustedForIme || forceUpdate) { - mAdjustedForForComplementDock = false; mAdjustedForIme = true; mAdjustImeAmount = 0f; mAdjustDividerAmount = 0f; @@ -927,12 +923,10 @@ public class TaskStack implements DimLayer.DimLayerUser, * @return Whether the amount has changed and a layout is needed. */ boolean setAdjustedForMinimizedDock(float minimizeAmount) { - mAdjustedForForComplementDock = false; - if (minimizeAmount != mMinimizeAmount) { mMinimizeAmount = minimizeAmount; updateAdjustedBounds(); - return true; + return isVisibleForUserLocked(); } else { return false; } @@ -942,33 +936,6 @@ public class TaskStack implements DimLayer.DimLayerUser, return mMinimizeAmount != 0f; } - void setAdjustedForComplementDock(Rect dockBounds, int dockSide) { - if (mMinimizeAmount != 0f || mAdjustedForIme) { - return; - } - mTmpAdjustedBounds.set(mBounds); - if (dockSide == DOCKED_TOP) { - mTmpAdjustedBounds.top = dockBounds.bottom; - } else if (dockSide == DOCKED_LEFT) { - mTmpAdjustedBounds.left = dockBounds.right; - } else if (dockSide == DOCKED_RIGHT) { - mTmpAdjustedBounds.right = dockBounds.left; - } else { - Slog.w(TAG_WM, "setAdjustedForComplementDock: invalid dock side " + dockSide); - return; - } - mAdjustedForForComplementDock = true; - setAdjustedBounds(mTmpAdjustedBounds); - } - - void resetAdjustedForComplementDock() { - if (mAdjustedForForComplementDock) { - mAdjustedForForComplementDock = false; - mTmpAdjustedBounds.setEmpty(); - setAdjustedBounds(mTmpAdjustedBounds); - } - } - /** * Puts all visible tasks that are adjusted for IME into resizing mode and adds the windows * to the list of to be drawn windows the service is waiting for. diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index c7148c1ef340..3f4c1d543790 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -2834,6 +2834,8 @@ public class WindowManagerService extends IWindowManager.Stub } win.mRelayoutCalled = true; + win.mInRelayout = true; + final int oldVisibility = win.mViewVisibility; win.mViewVisibility = viewVisibility; if (DEBUG_SCREEN_ON) { @@ -2974,6 +2976,7 @@ public class WindowManagerService extends IWindowManager.Stub if (DEBUG_LAYOUT) { Slog.v(TAG_WM, "Relayout complete " + win + ": outFrame=" + outFrame.toShortString()); } + win.mInRelayout = false; } if (configChanged) { @@ -3566,6 +3569,8 @@ public class WindowManagerService extends IWindowManager.Stub final ArrayList<Task> tasks = displayContent.getTasks(); final boolean inMultiWindow = isStackVisibleLocked(DOCKED_STACK_ID) || isStackVisibleLocked(FREEFORM_WORKSPACE_STACK_ID); + final boolean dockMinimized = + getDefaultDisplayContentLocked().mDividerControllerLocked.isMinimizedDock(); for (int taskNdx = tasks.size() - 1; taskNdx >= 0; --taskNdx) { AppTokenList tokens = tasks.get(taskNdx).mAppTokens; final int firstToken = tokens.size() - 1; @@ -3600,8 +3605,10 @@ public class WindowManagerService extends IWindowManager.Stub continue; } - // No app except the home app may specify the screen orientation in multi-window. - if (inMultiWindow && !atoken.mTask.isHomeTask()) { + // No app except the home app may specify the screen orientation in multi-window, + // and only if the docked stack is minimized to avoid weirdness when home task + // temporarily gets moved to the front. + if (inMultiWindow && (!atoken.mTask.isHomeTask() || !dockMinimized)) { continue; } @@ -7593,7 +7600,8 @@ public class WindowManagerService extends IWindowManager.Stub void adjustForImeIfNeeded(final DisplayContent displayContent) { final WindowState imeWin = mInputMethodWindow; - final boolean imeVisible = imeWin != null && imeWin.isVisibleLw() && imeWin.isDisplayedLw(); + final boolean imeVisible = imeWin != null && imeWin.isVisibleLw() && imeWin.isDisplayedLw() + && !displayContent.mDividerControllerLocked.isImeHideRequested(); final boolean dockVisible = isStackVisibleLocked(DOCKED_STACK_ID); final TaskStack imeTargetStack = getImeFocusStackLocked(); final int imeDockSide = (dockVisible && imeTargetStack != null) ? diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index be27c82d61fc..08bfa2de0b83 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -362,6 +362,8 @@ final class WindowState implements WindowManagerPolicy.WindowState { */ boolean mRelayoutCalled; + boolean mInRelayout; + /** * If the application has called relayout() with changes that can * impact its window's size, we need to perform a layout pass on it @@ -1630,6 +1632,12 @@ final class WindowState implements WindowManagerPolicy.WindowState { return task != null && task.inDockedWorkspace(); } + // TODO: Strange usage of word workspace here and above. + boolean inPinnedWorkspace() { + final Task task = getTask(); + return task != null && task.inPinnedWorkspace(); + } + boolean isDockedInEffect() { final Task task = getTask(); return task != null && task.isDockedInEffect(); @@ -2724,14 +2732,14 @@ final class WindowState implements WindowManagerPolicy.WindowState { return mStringNameCache; } - void transformFromScreenToSurfaceSpace(Rect rect) { + void transformClipRectFromScreenToSurfaceSpace(Rect clipRect) { if (mHScale >= 0) { - rect.left = (int) (rect.left / mHScale); - rect.right = (int) (rect.right / mHScale); + clipRect.left = (int) (clipRect.left / mHScale); + clipRect.right = (int) Math.ceil(clipRect.right / mHScale); } if (mVScale >= 0) { - rect.top = (int) (rect.top / mVScale); - rect.bottom = (int) (rect.bottom / mVScale); + clipRect.top = (int) (clipRect.top / mVScale); + clipRect.bottom = (int) Math.ceil(clipRect.bottom / mVScale); } } diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java index 42eddd5a0b10..3b4c3cf6863c 100644 --- a/services/core/java/com/android/server/wm/WindowStateAnimator.java +++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java @@ -23,7 +23,6 @@ import static android.view.WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED; import static android.view.WindowManager.LayoutParams.FLAG_SCALED; import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING; import static android.view.WindowManager.LayoutParams.TYPE_INPUT_METHOD; -import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER; import static com.android.server.wm.AppWindowAnimator.sDummyAnimation; import static com.android.server.wm.DragResizeMode.DRAG_RESIZE_MODE_FREEFORM; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ADD_REMOVE; @@ -1282,7 +1281,7 @@ class WindowStateAnimator { if (DEBUG_WINDOW_CROP) Slog.d(TAG, "win=" + w + " Clip rect after stack adjustment=" + clipRect); - w.transformFromScreenToSurfaceSpace(clipRect); + w.transformClipRectFromScreenToSurfaceSpace(clipRect); // See {@link WindowState#notifyMovedInStack} for why this is necessary. if (w.hasJustMovedInStack() && mLastClipRect.isEmpty() && !clipRect.isEmpty()) { @@ -1328,33 +1327,6 @@ class WindowStateAnimator { return; } - // We crop wallpaper windows to the stack bounds of their current target to avoid them - // showing behind transparent windows in other stacks in split-screen mode. - if (w.getBaseType() == TYPE_WALLPAPER) { - final WindowState wallpaperTarget = mWallpaperControllerLocked.getWallpaperTarget(); - if (wallpaperTarget != null) { - final Task task = wallpaperTarget.getTask(); - final WindowStateAnimator winAnimator = wallpaperTarget.mWinAnimator; - // We can only crop the wallpaper using final crop with stack bounds if the target - // is not animating, or if it's animating with clip mode STACK_CLIP_AFTER_ANIM. - // If it's animating with mode STACK_CLIP_NONE, we shouldn't crop either the task - // itself or the wallpaper. If it's animating with STACK_CLIP_BEFORE_ANIM, the crop - // is before the transform on the task itself. - final boolean useFinalCropOnWallpaper = !winAnimator.isAnimationSet() - || winAnimator.resolveStackClip() == STACK_CLIP_AFTER_ANIM; - if (task != null && !task.isFullscreen() - && task.cropWindowsToStackBounds() - && useFinalCropOnWallpaper){ - final TaskStack stack = task.mStack; - if (stack != null && !stack.isFullscreen()) { - stack.getDimBounds(mTmpStackBounds); - finalClipRect.set(mTmpStackBounds); - } - } - } - return; - } - final Task task = w.getTask(); if (task == null || !task.cropWindowsToStackBounds()) { return; @@ -1428,8 +1400,24 @@ class WindowStateAnimator { float extraHScale = (float) 1.0; float extraVScale = (float) 1.0; - mSurfaceResized = mSurfaceController.setSizeInTransaction( - mTmpSize.width(), mTmpSize.height(), recoveringMemory); + // Once relayout has been called at least once, we need to make sure + // we only resize the client surface during calls to relayout. For + // clients which use indeterminate measure specs (MATCH_PARENT), + // we may try and change their window size without a call to relayout. + // However, this would be unsafe, as the client may be in the middle + // of producing a frame at the old size, having just completed layout + // to find the surface size changed underneath it. + // + // TODO: For N we only apply this fix to the pinned workspace. As we + // aren't observing known issues here outside of PiP resizing. (Typically + // the other windows that use -1 are PopupWindows which aren't likely + // to be rendering while we resize). + if (!w.inPinnedWorkspace() || (!w.mRelayoutCalled || w.mInRelayout)) { + mSurfaceResized = mSurfaceController.setSizeInTransaction( + mTmpSize.width(), mTmpSize.height(), recoveringMemory); + } else { + mSurfaceResized = false; + } mForceScaleUntilResize = mForceScaleUntilResize && !mSurfaceResized; @@ -1437,10 +1425,12 @@ class WindowStateAnimator { if ((task != null && task.mStack.getForceScaleToCrop()) || mForceScaleUntilResize) { int hInsets = w.getAttrs().surfaceInsets.left + w.getAttrs().surfaceInsets.right; int vInsets = w.getAttrs().surfaceInsets.top + w.getAttrs().surfaceInsets.bottom; + float surfaceWidth = mSurfaceController.getWidth(); + float surfaceHeight = mSurfaceController.getHeight(); // We want to calculate the scaling based on the content area, not based on // the entire surface, so that we scale in sync with windows that don't have insets. - extraHScale = (mTmpClipRect.width() - hInsets) / (float)(mTmpSize.width() - hInsets); - extraVScale = (mTmpClipRect.height() - vInsets) / (float)(mTmpSize.height() - vInsets); + extraHScale = (mTmpClipRect.width() - hInsets) / (float)(surfaceWidth - hInsets); + extraVScale = (mTmpClipRect.height() - vInsets) / (float)(surfaceHeight - vInsets); // In the case of ForceScaleToCrop we scale entire tasks together, // and so we need to scale our offsets relative to the task bounds @@ -1462,14 +1452,14 @@ class WindowStateAnimator { // Since we are scaled to fit in our previously desired crop, we can now // expose the whole window in buffer space, and not risk extending // past where the system would have cropped us - mTmpClipRect.set(0, 0, mTmpSize.width(), mTmpSize.height()); + mTmpClipRect.set(0, 0, (int)surfaceWidth, (int)surfaceHeight); mTmpFinalClipRect.setEmpty(); // Various surfaces in the scaled stack may resize at different times. // We need to ensure for each surface, that we disable transformation matrix // scaling in the same transaction which we resize the surface in. // As we are in SCALING_MODE_SCALE_TO_WINDOW, SurfaceFlinger will - // then take over the scaling until the new buffer arrives, and things + // then take over the scaling until the new buffer arrives, and things // will be seamless. mForceScaleUntilResize = true; } else { @@ -1755,6 +1745,10 @@ class WindowStateAnimator { mWin.mAppToken.onFirstWindowDrawn(mWin, this); } + if (mWin.mAttrs.type == TYPE_INPUT_METHOD) { + mWin.mDisplayContent.mDividerControllerLocked.resetImeHideRequested(); + } + return true; } return false; diff --git a/services/core/java/com/android/server/wm/WindowSurfaceController.java b/services/core/java/com/android/server/wm/WindowSurfaceController.java index af47369b181e..9646a49b8a88 100644 --- a/services/core/java/com/android/server/wm/WindowSurfaceController.java +++ b/services/core/java/com/android/server/wm/WindowSurfaceController.java @@ -454,6 +454,15 @@ class WindowSurfaceController { return mSurfaceY; } + float getWidth() { + return mSurfaceW; + } + + float getHeight() { + return mSurfaceH; + } + + public void dump(PrintWriter pw, String prefix, boolean dumpAll) { if (dumpAll) { pw.print(prefix); pw.print("mSurface="); pw.println(mSurfaceControl); diff --git a/services/core/jni/com_android_server_location_FlpHardwareProvider.cpp b/services/core/jni/com_android_server_location_FlpHardwareProvider.cpp index 8ea9bfc04662..06d2031e4a4a 100644 --- a/services/core/jni/com_android_server_location_FlpHardwareProvider.cpp +++ b/services/core/jni/com_android_server_location_FlpHardwareProvider.cpp @@ -78,7 +78,7 @@ static inline void ThrowOnError( env->ThrowNew(exceptionClass, methodName); } -static bool IsValidCallbackThread() { +static bool IsValidCallbackThreadEnvOnly() { JNIEnv* env = AndroidRuntime::getJNIEnv(); if(sCallbackEnv == NULL || sCallbackEnv != env) { @@ -89,6 +89,20 @@ static bool IsValidCallbackThread() { return true; } +static bool IsValidCallbackThread() { + // sCallbacksObject is created when FlpHardwareProvider on Java side is + // initialized. Sometimes the hardware may call a function before the Java + // side is ready. In order to prevent a system crash, check whether + // sCallbacksObj has been created. If not, simply ignore this event from + // hardware. + if (sCallbacksObj == NULL) { + ALOGE("Attempt to use FlpHardwareProvider blocked, because it hasn't been initialized."); + return false; + } + + return IsValidCallbackThreadEnvOnly(); +} + static void BatchingCapabilitiesCallback(int32_t capabilities) { if(!IsValidCallbackThread()) { return; @@ -154,7 +168,7 @@ static int SetThreadEvent(ThreadEvent event) { } case DISASSOCIATE_JVM: { - if (!IsValidCallbackThread()) { + if (!IsValidCallbackThreadEnvOnly()) { ALOGE( "Attempted to dissasociate an unnownk callback thread : '%s'.", __FUNCTION__ @@ -661,16 +675,6 @@ static void GeofenceMonitorStatusCallback( TranslateToObject(lastLocation, locationObject); } - // sCallbacksObject is created when FlpHardwareProvider on Java side is - // initialized. Sometimes the hardware may call this function before the Java - // side is ready. In order to prevent the system crash, check whether - // sCallbacksObj has been created. If not, simply ignore this event from - // hardware. - if (sCallbacksObj == NULL) { - ALOGE("FlpHardwareProvider hasn't been initialized."); - return; - } - sCallbackEnv->CallVoidMethod( sCallbacksObj, sOnGeofenceMonitorStatus, diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 1af9ccbbcfd7..9a7e64b3a923 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -3810,12 +3810,16 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { // If caller has PO (or DO) it can change the password, so see if that's the case first. ActiveAdmin admin = getActiveAdminWithPolicyForUidLocked( null, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER, callingUid); - final boolean preN = getTargetSdk(admin.info.getPackageName(), - userHandle) <= android.os.Build.VERSION_CODES.M; - if (admin == null) { + final boolean preN; + if (admin != null) { + preN = getTargetSdk(admin.info.getPackageName(), + userHandle) <= android.os.Build.VERSION_CODES.M; + } else { // Otherwise, make sure the caller has any active admin with the right policy. admin = getActiveAdminForCallerLocked(null, DeviceAdminInfo.USES_POLICY_RESET_PASSWORD); + preN = getTargetSdk(admin.info.getPackageName(), + userHandle) <= android.os.Build.VERSION_CODES.M; // As of N, password resetting to empty/null is not allowed anymore. // TODO Should we allow DO/PO to set an empty password? diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index eed4351b9287..476a559eaea3 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -701,13 +701,15 @@ public final class SystemServer { // as appropriate. mSystemServiceManager.startService(UiModeManagerService.class); - Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "UpdatePackagesIfNeeded"); - try { - mPackageManagerService.updatePackagesIfNeeded(); - } catch (Throwable e) { - reportWtf("update packages", e); + if (!mOnlyCore) { + Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "UpdatePackagesIfNeeded"); + try { + mPackageManagerService.updatePackagesIfNeeded(); + } catch (Throwable e) { + reportWtf("update packages", e); + } + Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER); } - Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER); Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "PerformFstrimIfNeeded"); try { diff --git a/services/net/java/android/net/apf/ApfFilter.java b/services/net/java/android/net/apf/ApfFilter.java index 538e8f879a3d..485f2f5318f4 100644 --- a/services/net/java/android/net/apf/ApfFilter.java +++ b/services/net/java/android/net/apf/ApfFilter.java @@ -597,12 +597,13 @@ public class ApfFilter { private void generateIPv4FilterLocked(ApfGenerator gen) throws IllegalInstructionException { // Here's a basic summary of what the IPv4 filter program does: // - // if it's multicast and we're dropping multicast: - // drop - // if it's not broadcast: - // pass - // if it's not DHCP destined to our MAC: - // drop + // if filtering multicast (i.e. multicast lock not held): + // if it's multicast: + // drop + // if it's not broadcast: + // pass + // if it's not DHCP destined to our MAC: + // drop // pass if (mMulticastFilter) { @@ -610,27 +611,27 @@ public class ApfFilter { gen.addLoad8(Register.R0, IPV4_DEST_ADDR_OFFSET); gen.addAnd(0xf0); gen.addJumpIfR0Equals(0xe0, gen.DROP_LABEL); - } - // Drop all broadcasts besides DHCP addressed to us - // If not a broadcast packet, pass - gen.addLoadImmediate(Register.R0, ETH_DEST_ADDR_OFFSET); - gen.addJumpIfBytesNotEqual(Register.R0, ETH_BROADCAST_MAC_ADDRESS, gen.PASS_LABEL); - // If not UDP, drop - gen.addLoad8(Register.R0, IPV4_PROTOCOL_OFFSET); - gen.addJumpIfR0NotEquals(IPPROTO_UDP, gen.DROP_LABEL); - // If fragment, drop. This matches the BPF filter installed by the DHCP client. - gen.addLoad16(Register.R0, IPV4_FRAGMENT_OFFSET_OFFSET); - gen.addJumpIfR0AnyBitsSet(IPV4_FRAGMENT_OFFSET_MASK, gen.DROP_LABEL); - // If not to DHCP client port, drop - gen.addLoadFromMemory(Register.R1, gen.IPV4_HEADER_SIZE_MEMORY_SLOT); - gen.addLoad16Indexed(Register.R0, UDP_DESTINATION_PORT_OFFSET); - gen.addJumpIfR0NotEquals(DHCP_CLIENT_PORT, gen.DROP_LABEL); - // If not DHCP to our MAC address, drop - gen.addLoadImmediate(Register.R0, DHCP_CLIENT_MAC_OFFSET); - // NOTE: Relies on R1 containing IPv4 header offset. - gen.addAddR1(); - gen.addJumpIfBytesNotEqual(Register.R0, mHardwareAddress, gen.DROP_LABEL); + // Drop all broadcasts besides DHCP addressed to us + // If not a broadcast packet, pass + gen.addLoadImmediate(Register.R0, ETH_DEST_ADDR_OFFSET); + gen.addJumpIfBytesNotEqual(Register.R0, ETH_BROADCAST_MAC_ADDRESS, gen.PASS_LABEL); + // If not UDP, drop + gen.addLoad8(Register.R0, IPV4_PROTOCOL_OFFSET); + gen.addJumpIfR0NotEquals(IPPROTO_UDP, gen.DROP_LABEL); + // If fragment, drop. This matches the BPF filter installed by the DHCP client. + gen.addLoad16(Register.R0, IPV4_FRAGMENT_OFFSET_OFFSET); + gen.addJumpIfR0AnyBitsSet(IPV4_FRAGMENT_OFFSET_MASK, gen.DROP_LABEL); + // If not to DHCP client port, drop + gen.addLoadFromMemory(Register.R1, gen.IPV4_HEADER_SIZE_MEMORY_SLOT); + gen.addLoad16Indexed(Register.R0, UDP_DESTINATION_PORT_OFFSET); + gen.addJumpIfR0NotEquals(DHCP_CLIENT_PORT, gen.DROP_LABEL); + // If not DHCP to our MAC address, drop + gen.addLoadImmediate(Register.R0, DHCP_CLIENT_MAC_OFFSET); + // NOTE: Relies on R1 containing IPv4 header offset. + gen.addAddR1(); + gen.addJumpIfBytesNotEqual(Register.R0, mHardwareAddress, gen.DROP_LABEL); + } // Otherwise, pass gen.addJump(gen.PASS_LABEL); diff --git a/services/net/java/android/net/dhcp/DhcpClient.java b/services/net/java/android/net/dhcp/DhcpClient.java index 99b10c3da1c0..96c852bf55f5 100644 --- a/services/net/java/android/net/dhcp/DhcpClient.java +++ b/services/net/java/android/net/dhcp/DhcpClient.java @@ -84,7 +84,7 @@ import static android.net.dhcp.DhcpPacket.*; public class DhcpClient extends StateMachine { private static final String TAG = "DhcpClient"; - private static final boolean DBG = false; + private static final boolean DBG = true; private static final boolean STATE_DBG = false; private static final boolean MSG_DBG = false; private static final boolean PACKET_DBG = false; diff --git a/services/tests/servicestests/src/android/net/apf/ApfTest.java b/services/tests/servicestests/src/android/net/apf/ApfTest.java index 9e04d2301ad9..fae82ca4e7a3 100644 --- a/services/tests/servicestests/src/android/net/apf/ApfTest.java +++ b/services/tests/servicestests/src/android/net/apf/ApfTest.java @@ -663,7 +663,7 @@ public class ApfTest extends AndroidTestCase { @LargeTest public void testApfFilterIPv4() throws Exception { MockIpManagerCallback ipManagerCallback = new MockIpManagerCallback(); - ApfFilter apfFilter = new TestApfFilter(ipManagerCallback, false /* multicastFilter */); + ApfFilter apfFilter = new TestApfFilter(ipManagerCallback, true /* multicastFilter */); byte[] program = ipManagerCallback.getApfProgram(); // Verify empty packet of 100 zero bytes is passed @@ -726,46 +726,57 @@ public class ApfTest extends AndroidTestCase { byte[] program = ipManagerCallback.getApfProgram(); // Construct IPv4 and IPv6 multicast packets. - ByteBuffer v4packet = ByteBuffer.wrap(new byte[100]); - v4packet.putShort(ETH_ETHERTYPE_OFFSET, (short)ETH_P_IP); - v4packet.position(IPV4_DEST_ADDR_OFFSET); - v4packet.put(new byte[]{(byte)224,0,0,1}); - - ByteBuffer v6packet = ByteBuffer.wrap(new byte[100]); - v6packet.putShort(ETH_ETHERTYPE_OFFSET, (short)ETH_P_IPV6); - v6packet.put(IPV6_NEXT_HEADER_OFFSET, (byte)IPPROTO_UDP); - v6packet.position(IPV6_DEST_ADDR_OFFSET); - v6packet.put(new byte[]{(byte)0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,(byte)0xfb}); + ByteBuffer mcastv4packet = ByteBuffer.wrap(new byte[100]); + mcastv4packet.putShort(ETH_ETHERTYPE_OFFSET, (short)ETH_P_IP); + mcastv4packet.position(IPV4_DEST_ADDR_OFFSET); + mcastv4packet.put(new byte[]{(byte)224,0,0,1}); + + ByteBuffer mcastv6packet = ByteBuffer.wrap(new byte[100]); + mcastv6packet.putShort(ETH_ETHERTYPE_OFFSET, (short)ETH_P_IPV6); + mcastv6packet.put(IPV6_NEXT_HEADER_OFFSET, (byte)IPPROTO_UDP); + mcastv6packet.position(IPV6_DEST_ADDR_OFFSET); + mcastv6packet.put(new byte[]{(byte)0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,(byte)0xfb}); + + // Construct IPv4 broadcast packet. + ByteBuffer bcastv4packet = ByteBuffer.wrap(new byte[100]); + bcastv4packet.put(ETH_BROADCAST_MAC_ADDRESS); + bcastv4packet.putShort(ETH_ETHERTYPE_OFFSET, (short)ETH_P_IP); + bcastv4packet.position(IPV4_DEST_ADDR_OFFSET); + bcastv4packet.put(new byte[]{(byte)192,(byte)0,(byte)2,(byte)63}); // Verify initially disabled multicast filter is off - assertPass(program, v4packet.array(), 0); - assertPass(program, v6packet.array(), 0); + assertPass(program, bcastv4packet.array(), 0); + assertPass(program, mcastv4packet.array(), 0); + assertPass(program, mcastv6packet.array(), 0); // Turn on multicast filter and verify it works ipManagerCallback.resetApfProgramWait(); apfFilter.setMulticastFilter(true); program = ipManagerCallback.getApfProgram(); - assertDrop(program, v4packet.array(), 0); - assertDrop(program, v6packet.array(), 0); + assertDrop(program, bcastv4packet.array(), 0); + assertDrop(program, mcastv4packet.array(), 0); + assertDrop(program, mcastv6packet.array(), 0); // Turn off multicast filter and verify it's off ipManagerCallback.resetApfProgramWait(); apfFilter.setMulticastFilter(false); program = ipManagerCallback.getApfProgram(); - assertPass(program, v4packet.array(), 0); - assertPass(program, v6packet.array(), 0); + assertPass(program, bcastv4packet.array(), 0); + assertPass(program, mcastv4packet.array(), 0); + assertPass(program, mcastv6packet.array(), 0); // Verify it can be initialized to on ipManagerCallback.resetApfProgramWait(); apfFilter.shutdown(); apfFilter = new TestApfFilter(ipManagerCallback, true /* multicastFilter */); program = ipManagerCallback.getApfProgram(); - assertDrop(program, v4packet.array(), 0); - assertDrop(program, v6packet.array(), 0); + assertDrop(program, bcastv4packet.array(), 0); + assertDrop(program, mcastv4packet.array(), 0); + assertDrop(program, mcastv6packet.array(), 0); // Verify that ICMPv6 multicast is not dropped. - v6packet.put(IPV6_NEXT_HEADER_OFFSET, (byte)IPPROTO_ICMPV6); - assertPass(program, v6packet.array(), 0); + mcastv6packet.put(IPV6_NEXT_HEADER_OFFSET, (byte)IPPROTO_ICMPV6); + assertPass(program, mcastv6packet.array(), 0); apfFilter.shutdown(); } diff --git a/services/usb/java/com/android/server/usb/MtpNotificationManager.java b/services/usb/java/com/android/server/usb/MtpNotificationManager.java index 101e2008d3e9..5c46222b2feb 100644 --- a/services/usb/java/com/android/server/usb/MtpNotificationManager.java +++ b/services/usb/java/com/android/server/usb/MtpNotificationManager.java @@ -139,7 +139,7 @@ class MtpNotificationManager { if (usbInterface.getInterfaceClass() == UsbConstants.USB_SUBCLASS_VENDOR_SPEC && usbInterface.getInterfaceSubclass() == SUBCLASS_MTP && usbInterface.getInterfaceProtocol() == PROTOCOL_MTP && - usbInterface.getName().equals("MTP")) { + "MTP".equals(usbInterface.getName())) { return true; } } diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java index 51f5899b6841..23c58fe4ea6c 100644 --- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java @@ -19,7 +19,6 @@ package com.android.server.voiceinteraction; import android.Manifest; import android.app.ActivityManager; import android.app.ActivityManagerInternal; -import android.app.ActivityManagerNative; import android.app.AppGlobals; import android.content.ComponentName; import android.content.ContentResolver; @@ -415,7 +414,10 @@ public class VoiceInteractionManagerService extends SystemService { VoiceInteractionServiceInfo findAvailInteractor(int userHandle, String packageName) { List<ResolveInfo> available = mContext.getPackageManager().queryIntentServicesAsUser( - new Intent(VoiceInteractionService.SERVICE_INTERFACE), 0, userHandle); + new Intent(VoiceInteractionService.SERVICE_INTERFACE), + PackageManager.MATCH_DIRECT_BOOT_AWARE + | PackageManager.MATCH_DIRECT_BOOT_UNAWARE + | PackageManager.MATCH_DEBUG_TRIAGED_MISSING, userHandle); int numAvailable = available.size(); if (numAvailable == 0) { diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 613fae4916b6..5c2e0baab768 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -582,6 +582,20 @@ public class CarrierConfigManager { public static final String KEY_WFC_DATA_SPN_FORMAT_IDX_INT = "wfc_data_spn_format_idx_int"; /** + * Boolean to decide whether to use #KEY_CARRIER_NAME_STRING from CarrierConfig app. + * @hide + */ + public static final String KEY_CARRIER_NAME_OVERRIDE_BOOL = "carrier_name_override_bool"; + + /** + * String to identify carrier name in CarrierConfig app. This string is used only if + * #KEY_CARRIER_NAME_OVERRIDE_BOOL is true + * @hide + */ + public static final String KEY_CARRIER_NAME_STRING = "carrier_name_string"; + + + /** * If this is true, the SIM card (through Customer Service Profile EF file) will be able to * prevent manual operator selection. If false, this SIM setting will be ignored and manual * operator selection will always be available. See CPHS4_2.WW6, CPHS B.4.7.1 for more @@ -785,6 +799,8 @@ public class CarrierConfigManager { sDefaults.putInt(KEY_WFC_SPN_FORMAT_IDX_INT, 0); sDefaults.putInt(KEY_WFC_DATA_SPN_FORMAT_IDX_INT, 0); sDefaults.putBoolean(KEY_CONFIG_WIFI_DISABLE_IN_ECBM, false); + sDefaults.putBoolean(KEY_CARRIER_NAME_OVERRIDE_BOOL, false); + sDefaults.putString(KEY_CARRIER_NAME_STRING, ""); // MMS defaults sDefaults.putBoolean(KEY_MMS_ALIAS_ENABLED_BOOL, false); diff --git a/tests/UiBench/src/com/android/test/uibench/FullscreenOverdrawActivity.java b/tests/UiBench/src/com/android/test/uibench/FullscreenOverdrawActivity.java index f1ecc5624d57..b9c5fac96a3e 100644 --- a/tests/UiBench/src/com/android/test/uibench/FullscreenOverdrawActivity.java +++ b/tests/UiBench/src/com/android/test/uibench/FullscreenOverdrawActivity.java @@ -19,8 +19,11 @@ import android.animation.ObjectAnimator; import android.animation.ValueAnimator; import android.content.Context; import android.graphics.Canvas; +import android.graphics.ColorFilter; +import android.graphics.PixelFormat; import android.graphics.Color; import android.graphics.Paint; +import android.graphics.drawable.Drawable; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; import android.view.View; @@ -31,37 +34,48 @@ import android.view.View; * This should all be optimized out by the renderer. */ public class FullscreenOverdrawActivity extends AppCompatActivity { - private class OverdrawView extends View { + private class OverdrawDrawable extends Drawable { Paint paint = new Paint(); int mColorValue = 0; - public OverdrawView(Context context) { - super(context); - } - @SuppressWarnings("unused") public void setColorValue(int colorValue) { mColorValue = colorValue; - invalidate(); + invalidateSelf(); } @Override - protected void onDraw(Canvas canvas) { + public void draw(Canvas canvas) { paint.setColor(Color.rgb(mColorValue, 255 - mColorValue, 255)); for (int i = 0; i < 400; i++) { - canvas.drawRect(0, 0, getWidth(), getHeight(), paint); + canvas.drawRect(getBounds(), paint); } } + + @Override + public void setAlpha(int alpha) { + } + + @Override + public void setColorFilter(ColorFilter colorFilter) { + } + + @Override + public int getOpacity() { + return PixelFormat.OPAQUE; + } } @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - OverdrawView overdrawView = new OverdrawView(this); - setContentView(overdrawView); + OverdrawDrawable overdraw = new OverdrawDrawable(); + getWindow().setBackgroundDrawable(overdraw); + + setContentView(new View(this)); - ObjectAnimator objectAnimator = ObjectAnimator.ofInt(overdrawView, "colorValue", 0, 255); + ObjectAnimator objectAnimator = ObjectAnimator.ofInt(overdraw, "colorValue", 0, 255); objectAnimator.setRepeatMode(ValueAnimator.REVERSE); objectAnimator.setRepeatCount(ValueAnimator.INFINITE); objectAnimator.start(); |
